[pkg-eucalyptus-commits] r196 - in mule/trunk/debian: . patches source

Charles Plessy plessy at alioth.debian.org
Wed Apr 18 00:27:18 UTC 2012


Author: plessy
Date: 2012-04-18 00:27:18 +0000 (Wed, 18 Apr 2012)
New Revision: 196

Added:
   mule/trunk/debian/management-includesfile
   mule/trunk/debian/patches/add_stub_handlers.diff
   mule/trunk/debian/patches/remove_yourkit_support.diff
   mule/trunk/debian/source/
   mule/trunk/debian/source/format
Modified:
   mule/trunk/debian/build.xml
   mule/trunk/debian/changelog
   mule/trunk/debian/control
   mule/trunk/debian/patches/series
   mule/trunk/debian/rules
Log:
Imported 2.0.1-4 from Brian's PPA.

https://launchpad.net/~brian-thomason/+archive/debian/+sourcepub/2377055/+listing-archive-extra


Modified: mule/trunk/debian/build.xml
===================================================================
--- mule/trunk/debian/build.xml	2012-04-10 19:28:04 UTC (rev 195)
+++ mule/trunk/debian/build.xml	2012-04-18 00:27:18 UTC (rev 196)
@@ -31,7 +31,7 @@
     <attribute name="jar"/>
     <sequential>
       <mkdir dir="@{dir}/build"/>
-      <javac srcdir="@{dir}/${src.dir}"
+      <javac     srcdir="@{dir}/${src.dir}"
                  classpathref="classpath"
                  destdir="@{dir}/${build.dir}"
                  deprecation="false"
@@ -60,18 +60,11 @@
 		<!--build-sub dir="modules/acegi" jar="module-acegi"/-->
 		<!--build-sub dir="modules/boot" jar="module-boot"/-->
 		<!--build-sub dir="modules/jboss-transactions" jar="module-jboss-transactions"/-->
-		<build-sub dir="modules/jaas" jar="module-jaas"/>
 		<!--build-sub dir="modules/jca/jca-core" jar="module-jca-core"/-->
-		<!--build-sub dir="modules/management" jar="module-management"/-->
-		<build-sub dir="modules/ognl" jar="module-ognl"/>
 		<!--build-sub dir="modules/osgi" jar="module-osgi"/-->
 		<!--build-sub dir="modules/persistence" jar="module-persistence"/-->
 		<!--build-sub dir="modules/pgp" jar="module-pgp"/-->
-		<build-sub dir="modules/scripting" jar="module-scripting"/>
-		<build-sub dir="modules/spring-extras" jar="module-spring-extras"/>
-		<build-sub dir="transports/bpm" jar="transport-bpm"/>
 		<!--build-sub dir="transports/cxf" jar="transport-cxf"/-->
-		<build-sub dir="transports/ejb" jar="transport-ejb"/>
 		<!--build-sub dir="transports/email" jar="transport-email"/--> 
 		<!--build-sub dir="transports/file" jar="transport-file"/-->
 		<!--build-sub dir="transports/ftp" jar="transport-ftp"/ missing: ibid-file-->
@@ -79,15 +72,43 @@
 		<!-- build-sub dir="transports/axis" jar="transport-axis"/ missing: ibid-http -->
 		<!--build-sub dir="transports/jbpm" jar="transport-jbpm"/ missing: jbpm-->
 		<!--build-sub dir="transports/jdbc" jar="transport-jdbc"/ missing: commons-dbutils -->
-		<build-sub dir="transports/jms" jar="transport-jms"/>
-		<build-sub dir="transports/multicast" jar="transport-multicast"/>
+		<build-sub dir="transports/stdio" jar="transport-stdio"/>
+		<build-sub dir="transports/tcp" jar="transport-tcp"/>
+		<build-sub dir="transports/udp" jar="transport-udp"/>
+		<build-sub dir="transports/ssl" jar="transport-ssl"/>
 		<build-sub dir="transports/quartz" jar="transport-quartz"/>
 		<build-sub dir="transports/rmi" jar="transport-rmi"/>
+
+		<!--build-sub dir="modules/management" jar="module-management"/-->
+                <!--Management module must be built manually as to properly exclude YourKit, sourcepath must be unset-->
+                <mkdir dir="modules/management/build"/>
+                <javac     sourcepath="" srcdir="modules/management/${src.dir}"
+                           classpathref="classpath"
+                           destdir="modules/management/${build.dir}"
+                           deprecation="false"
+                           failonerror="false"
+                           debug="true"
+                           target="1.5"
+                           listfiles="true"
+                           includesfile="debian/management-includesfile"/>
+                <jar destfile="${target.dir}/${mule.basename}-management-${mule.version}.jar">
+                  <fileset dir="modules/management/${rsrc.dir}">
+                    <include name="**/*"/>
+                  </fileset>
+                  <fileset dir="modules/management/${build.dir}">
+                    <include name="**/*"/>
+                  </fileset>
+                </jar>
+
+		<build-sub dir="modules/ognl" jar="module-ognl"/>
+		<build-sub dir="modules/scripting" jar="module-scripting"/>
+		<build-sub dir="modules/spring-extras" jar="module-spring-extras"/>
+		<build-sub dir="transports/multicast" jar="transport-multicast"/>
+		<build-sub dir="transports/bpm" jar="transport-bpm"/>
+		<build-sub dir="modules/jaas" jar="module-jaas"/>
+		<build-sub dir="transports/ejb" jar="transport-ejb"/>
 		<build-sub dir="transports/soap" jar="transport-soap"/>
-		<build-sub dir="transports/ssl" jar="transport-ssl"/>
-		<build-sub dir="transports/stdio" jar="transport-stdio"/>
-		<build-sub dir="transports/tcp" jar="transport-tcp"/>
-		<build-sub dir="transports/udp" jar="transport-udp"/>
+		<build-sub dir="transports/jms" jar="transport-jms"/>
     <build-sub dir="transports/vm" jar="transport-vm"/>
 		<!--build-sub dir="transports/xmpp" jar="transport-xmpp"/ missing: smack -->
   </target>
@@ -102,34 +123,34 @@
 		<clean-sub dir="modules/acegi" jar="module-acegi"/>
 		<clean-sub dir="modules/boot" jar="module-boot"/>
 		<clean-sub dir="modules/jboss-transactions" jar="module-jboss-transactions"/>
-		<clean-sub dir="modules/jaas" jar="module-jaas"/>
 		<clean-sub dir="modules/jca" jar="module-jca"/>
 		<clean-sub dir="modules/management" jar="module-management"/>
-		<clean-sub dir="modules/ognl" jar="module-ognl"/>
 		<clean-sub dir="modules/osgi" jar="module-osgi"/>
 		<clean-sub dir="modules/persistence" jar="module-persistence"/>
 		<clean-sub dir="modules/pgp" jar="module-pgp"/>
-		<clean-sub dir="modules/scripting" jar="module-scripting"/>
-		<clean-sub dir="modules/spring-extras" jar="module-spring-extras"/>
 		<clean-sub dir="transports/axis" jar="transport-axis"/>
-		<clean-sub dir="transports/bpm" jar="transport-bpm"/>
 		<clean-sub dir="transports/cxf" jar="transport-cxf"/>
-		<clean-sub dir="transports/ejb" jar="transport-ejb"/>
 		<clean-sub dir="transports/email" jar="transport-email"/>
 		<clean-sub dir="transports/file" jar="transport-file"/>
 		<clean-sub dir="transports/ftp" jar="transport-ftp"/>
 		<clean-sub dir="transports/http" jar="transport-http"/>
-		<clean-sub dir="transports/jbpm" jar="transport-jbpm"/>
 		<clean-sub dir="transports/jdbc" jar="transport-jdbc"/>
-		<clean-sub dir="transports/jms" jar="transport-jms"/>
-		<clean-sub dir="transports/multicast" jar="transport-multicast"/>
+		<clean-sub dir="transports/bpm" jar="transport-bpm"/>
+		<clean-sub dir="transports/stdio" jar="transport-stdio"/>
+		<clean-sub dir="transports/tcp" jar="transport-tcp"/>
+		<clean-sub dir="transports/udp" jar="transport-udp"/>
+		<clean-sub dir="transports/ssl" jar="transport-ssl"/>
 		<clean-sub dir="transports/quartz" jar="transport-quartz"/>
 		<clean-sub dir="transports/rmi" jar="transport-rmi"/>
+		<clean-sub dir="modules/ognl" jar="module-ognl"/>
+		<clean-sub dir="modules/scripting" jar="module-scripting"/>
+		<clean-sub dir="modules/spring-extras" jar="module-spring-extras"/>
+		<clean-sub dir="transports/multicast" jar="transport-multicast"/>
+		<clean-sub dir="transports/jbpm" jar="transport-jbpm"/>
+		<clean-sub dir="modules/jaas" jar="module-jaas"/>
+		<clean-sub dir="transports/ejb" jar="transport-ejb"/>
 		<clean-sub dir="transports/soap" jar="transport-soap"/>
-		<clean-sub dir="transports/ssl" jar="transport-ssl"/>
-		<clean-sub dir="transports/stdio" jar="transport-stdio"/>
-		<clean-sub dir="transports/tcp" jar="transport-tcp"/>
-		<clean-sub dir="transports/udp" jar="transport-udp"/>
+		<clean-sub dir="transports/jms" jar="transport-jms"/>
 		<clean-sub dir="transports/vm" jar="transport-vm"/>
 		<clean-sub dir="transports/xmpp" jar="transport-xmpp"/>
     <delete dir="${target.dir}"/>

Modified: mule/trunk/debian/changelog
===================================================================
--- mule/trunk/debian/changelog	2012-04-10 19:28:04 UTC (rev 195)
+++ mule/trunk/debian/changelog	2012-04-18 00:27:18 UTC (rev 196)
@@ -1,3 +1,12 @@
+mule (2.0.1-4) precise; urgency=low
+
+  * Converted to Debian source format 3.0 (quilt)
+  * Reordered modules in debian/build.xml so that they would build properly
+  * Added mule-management-module
+  * Added stub functions for spring-extras compilation against spring3-context 
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Fri, 23 Mar 2012 17:03:25 +0000
+
 mule (2.0.1-3) unstable; urgency=low
 
   * Team upload.

Modified: mule/trunk/debian/control
===================================================================
--- mule/trunk/debian/control	2012-04-10 19:28:04 UTC (rev 195)
+++ mule/trunk/debian/control	2012-04-18 00:27:18 UTC (rev 196)
@@ -55,7 +55,8 @@
  libspring-web-java,
  libspring-context-java,
  libspring-jdbc-java,
- libspring-transaction-java
+ libspring-transaction-java,
+ libservice-wrapper-java
 Standards-Version: 3.9.2
 VCS-Svn: svn://svn.debian.org/pkg-eucalyptus/mule/trunk
 VCS-Browser: http://svn.debian.org/viewvc/pkg-eucalyptus/mule/

Added: mule/trunk/debian/management-includesfile
===================================================================
--- mule/trunk/debian/management-includesfile	                        (rev 0)
+++ mule/trunk/debian/management-includesfile	2012-04-18 00:27:18 UTC (rev 196)
@@ -0,0 +1,44 @@
+org/mule/module/management/ManagementException.java
+org/mule/module/management/agent/DefaultJmxSupportAgent.java
+org/mule/module/management/agent/FixedHostRmiClientSocketFactory.java
+org/mule/module/management/agent/IBMSslAdapterServerSocketFactory.java
+org/mule/module/management/agent/JdmkAgent.java
+org/mule/module/management/agent/JmxAgent.java
+org/mule/module/management/agent/JmxManagementException.java
+org/mule/module/management/agent/JmxServerNotificationAgent.java
+org/mule/module/management/agent/Log4jAgent.java
+org/mule/module/management/agent/Mx4jAgent.java
+org/mule/module/management/agent/RmiRegistryAgent.java
+org/mule/module/management/agent/WrapperManagerAgent.java
+org/mule/module/management/config/JmxAgentDefinitionParser.java
+org/mule/module/management/config/ManagementNamespaceHandler.java
+org/mule/module/management/i18n/ManagementMessages.java
+org/mule/module/management/mbean/ConnectorService.java
+org/mule/module/management/mbean/ConnectorServiceMBean.java
+org/mule/module/management/mbean/EndpointService.java
+org/mule/module/management/mbean/EndpointServiceMBean.java
+org/mule/module/management/mbean/MBeanServerFactory.java
+org/mule/module/management/mbean/ModelService.java
+org/mule/module/management/mbean/ModelServiceMBean.java
+org/mule/module/management/mbean/MuleConfigurationService.java
+org/mule/module/management/mbean/MuleConfigurationServiceMBean.java
+org/mule/module/management/mbean/MuleService.java
+org/mule/module/management/mbean/MuleServiceMBean.java
+org/mule/module/management/mbean/RegistryService.java
+org/mule/module/management/mbean/RegistryServiceMBean.java
+org/mule/module/management/mbean/RouterStats.java
+org/mule/module/management/mbean/RouterStatsMBean.java
+org/mule/module/management/mbean/ServiceService.java
+org/mule/module/management/mbean/ServiceServiceMBean.java
+org/mule/module/management/mbean/ServiceStats.java
+org/mule/module/management/mbean/ServiceStatsMBean.java
+org/mule/module/management/mbean/StatisticsService.java
+org/mule/module/management/mbean/StatisticsServiceMBean.java
+org/mule/module/management/support/AbstractJmxSupport.java
+org/mule/module/management/support/AutoDiscoveryJmxSupportFactory.java
+org/mule/module/management/support/JmxLegacySupport.java
+org/mule/module/management/support/JmxModernSupport.java
+org/mule/module/management/support/JmxRegistrationContext.java
+org/mule/module/management/support/JmxSupport.java
+org/mule/module/management/support/JmxSupportFactory.java
+org/mule/module/management/support/SimplePasswordJmxAuthenticator.java

Added: mule/trunk/debian/patches/add_stub_handlers.diff
===================================================================
--- mule/trunk/debian/patches/add_stub_handlers.diff	                        (rev 0)
+++ mule/trunk/debian/patches/add_stub_handlers.diff	2012-04-18 00:27:18 UTC (rev 196)
@@ -0,0 +1,28 @@
+Description: Add stub handlers for new functions in Spring 3 (TODO: May need implementing)
+Author: Brian Thomason <brian.thomason at eucalyptus.com>
+
+--- mule-2.0.1.orig/modules/spring-extras/src/main/java/org/mule/module/spring/events/MuleEventMulticaster.java
++++ mule-2.0.1/modules/spring-extras/src/main/java/org/mule/module/spring/events/MuleEventMulticaster.java
+@@ -220,6 +220,10 @@ public class MuleEventMulticaster
+         listeners.add(listenerToAdd);
+     }
+ 
++    public void addApplicationListenerBean(String listenerBeanName) {
++        return;
++    }
++
+     /**
+      * Removes a listener from the multicaster
+      * 
+@@ -250,6 +254,11 @@ public class MuleEventMulticaster
+         listeners.remove(listener);
+     }
+ 
++    public void removeApplicationListenerBean(String listenerBeanName) {
++        return;
++    }
++
++
+     /**
+      * Removes all the listeners from the multicaster
+      */

Added: mule/trunk/debian/patches/remove_yourkit_support.diff
===================================================================
--- mule/trunk/debian/patches/remove_yourkit_support.diff	                        (rev 0)
+++ mule/trunk/debian/patches/remove_yourkit_support.diff	2012-04-18 00:27:18 UTC (rev 196)
@@ -0,0 +1,61 @@
+Description: Disable YourKit support (it is a commercial profiler)
+Author: Brian Thomason <brian.thomason at eucalyptus.com>
+
+--- mule-2.0.1.orig/modules/management/src/main/java/org/mule/module/management/agent/DefaultJmxSupportAgent.java
++++ mule-2.0.1/modules/management/src/main/java/org/mule/module/management/agent/DefaultJmxSupportAgent.java
+@@ -147,14 +147,14 @@ public class DefaultJmxSupportAgent exte
+                 }
+             }
+ 
+-            if (loadProfilerAgent)
+-            {
+-                agent = createProfilerAgent();
+-                if (!isAgentRegistered(agent))
+-                {
+-                    RegistryContext.getRegistry().registerAgent(agent);
+-                }
+-            }
++            //if (loadProfilerAgent)
++            //{
++            //    agent = createProfilerAgent();
++            //    if (!isAgentRegistered(agent))
++            //    {
++            //        RegistryContext.getRegistry().registerAgent(agent);
++            //    }
++            //}
+ 
+             // remove this agent once it has registered the other agents
+             //TODO RM* this currently does nothing!!!
+@@ -232,10 +232,12 @@ public class DefaultJmxSupportAgent exte
+         return new JdmkAgent();
+     }
+ 
++/**
+     protected YourKitProfilerAgent createProfilerAgent()
+     {
+         return new YourKitProfilerAgent();
+     }
++**/
+ 
+     protected boolean isAgentRegistered(Agent agent)
+     {
+--- mule-2.0.1.orig/modules/management/src/main/java/org/mule/module/management/config/ManagementNamespaceHandler.java
++++ mule-2.0.1/modules/management/src/main/java/org/mule/module/management/config/ManagementNamespaceHandler.java
+@@ -21,7 +21,7 @@ import org.mule.module.management.agent.
+ import org.mule.module.management.agent.Log4jAgent;
+ import org.mule.module.management.agent.Mx4jAgent;
+ import org.mule.module.management.agent.RmiRegistryAgent;
+-import org.mule.module.management.agent.YourKitProfilerAgent;
++//import org.mule.module.management.agent.YourKitProfilerAgent;
+ 
+ /**
+  * Handles all configuration elements in the Mule Management module.
+@@ -46,7 +46,7 @@ public class ManagementNamespaceHandler
+ 
+         registerBeanDefinitionParser("publish-notifications", new AgentDefinitionParser(EndpointNotificationLoggerAgent.class));
+         registerBeanDefinitionParser("rmi-server", new AgentDefinitionParser(RmiRegistryAgent.class));
+-        registerBeanDefinitionParser("yourkit-profiler", new AgentDefinitionParser(YourKitProfilerAgent.class));
++        //registerBeanDefinitionParser("yourkit-profiler", new AgentDefinitionParser(YourKitProfilerAgent.class));
+         registerBeanDefinitionParser("custom-agent", new AgentDefinitionParser());
+ 
+         //This gets processed by the jmx-server parser

Modified: mule/trunk/debian/patches/series
===================================================================
--- mule/trunk/debian/patches/series	2012-04-10 19:28:04 UTC (rev 195)
+++ mule/trunk/debian/patches/series	2012-04-18 00:27:18 UTC (rev 196)
@@ -1,2 +1,4 @@
 01_fix_fileutiles_return.diff
 03_remove_spring_jms.diff
+add_stub_handlers.diff 
+remove_yourkit_support.diff

Modified: mule/trunk/debian/rules
===================================================================
--- mule/trunk/debian/rules	2012-04-10 19:28:04 UTC (rev 195)
+++ mule/trunk/debian/rules	2012-04-18 00:27:18 UTC (rev 196)
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 SVN                  := https://svn.codehaus.org/mule/tags/mule-$(DEB_UPSTREAM_VERSION)
 REQUIRED_JVM_VERSION := 1.5
@@ -20,12 +19,12 @@
 	echo "'lib$(DEB_SOURCE_PACKAGE)-java-$(DEB_UPSTREAM_VERSION_SHORT)'"
 
 #                        
-DEB_JARS             := groovy quartz geronimo-jms-1.1-spec jaxrpc commons-net2 axis aopalliance backport-util-concurrent commons-beanutils commons-cli commons-collections3 commons-httpclient commons-io commons-jxpath commons-logging commons-lang commons-pool dom4j geronimo-j2ee-connector-1.5-spec jaxen.jar jug-asl log4j-1.2 geronimo-ejb-3.0-spec geronimo-jta-1.0.1b-spec jboss-transaction maven-artifact-manager mx4j ognl servlet-2.3 spring3-beans spring3-core spring3-web spring3-context spring3-jdbc spring3-tx xstream
+DEB_JARS             := groovy quartz /usr/share/java/geronimo-jms_1.1_spec.jar jaxrpc commons-net2 axis aopalliance backport-util-concurrent commons-beanutils commons-cli commons-collections3 commons-httpclient commons-io commons-jxpath commons-logging commons-lang commons-pool dom4j geronimo-j2ee-connector-1.5-spec jaxen.jar jug-asl log4j-1.2 geronimo-ejb-3.0-spec geronimo-jta-1.0.1b-spec jboss-transaction maven-artifact-manager mx4j ognl servlet-2.3 spring3-beans spring3-core spring3-web spring3-context spring3-jdbc spring3-transaction-3.x xstream mx4j-tools mx4j-remote wrapper
 
 binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java-$(DEB_UPSTREAM_VERSION_SHORT)::
 	for n in core \
-		module-builders module-client module-jaas module-ognl module-spring-config module-scripting module-spring-extras module-xml \
-		transport-bpm transport-ejb transport-jms transport-multicast transport-quartz transport-rmi transport-soap transport-ssl transport-stdio transport-tcp transport-udp transport-vm ; \
+		module-builders module-client module-jaas module-ognl module-spring-config module-scripting module-spring-extras module-xml module-management\
+		transport-rmi transport-ejb transport-jms transport-multicast transport-quartz transport-bpm transport-soap transport-ssl transport-stdio transport-tcp transport-udp transport-vm ; \
 	do \
 		jarbasename=$(DEB_SOURCE_PACKAGE)-$$n ; \
 		dh_install target/$$jarbasename-$(DEB_UPSTREAM_VERSION).jar usr/share/java ; \
@@ -38,4 +37,3 @@
 		svn export $(SVN) $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) && \
 		GZIP="--best --no-name" tar c --exclude-vcs --exclude-from=../debian/exclude -zvf ../../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
 	rm -rf orig_tmp
-        

Added: mule/trunk/debian/source/format
===================================================================
--- mule/trunk/debian/source/format	                        (rev 0)
+++ mule/trunk/debian/source/format	2012-04-18 00:27:18 UTC (rev 196)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the pkg-eucalyptus-commits mailing list