servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r587992 [1/3] - in /incubator/servicemix/branches/servicemix-4.0: ./ apache-servicemix/ apache-servicemix/src/main/descriptors/ apache-servicemix/src/main/installers/ apache-servicemix/src/main/release/ apache-servicemix/src/main/release/bi...
Date Wed, 24 Oct 2007 20:03:15 GMT
Author: gnodet
Date: Wed Oct 24 13:03:06 2007
New Revision: 587992

URL: http://svn.apache.org/viewvc?rev=587992&view=rev
Log:
Change distribution to not use installers, add management feature

Added:
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/libwrapper.so   (with props)
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/servicemix.sh
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/wrapper   (with props)
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/wrapper.conf
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/macosx/
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/macosx/libwrapper.jnilib   (with props)
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/macosx/servicemix.sh
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/macosx/wrapper   (with props)
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/macosx/wrapper.conf
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/servicemix.bat   (with props)
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/servicemix.sh   (with props)
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/win32/
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/win32/InstallService.bat
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/win32/UninstallService.bat
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/win32/servicemix.bat
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/win32/wrapper.conf
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/win32/wrapper.dll   (with props)
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/win32/wrapper.exe   (with props)
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/wrapper.jar   (with props)
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/config.properties
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/factories/
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/factories/management.properties
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.shell.properties
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.transaction.properties
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.ops4j.pax.logging.properties
    incubator/servicemix/branches/servicemix-4.0/bundles/acegi/   (with props)
    incubator/servicemix/branches/servicemix-4.0/bundles/acegi/pom.xml
    incubator/servicemix/branches/servicemix-4.0/gshell/src/test/configs/services/org.apache.servicemix.shell.properties
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/   (with props)
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
    incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/
      - copied from r587600, incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/felix/
    incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/
      - copied from r587990, incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/felix/main/
    incubator/servicemix/branches/servicemix-4.0/management/   (with props)
    incubator/servicemix/branches/servicemix-4.0/management/acegi/   (with props)
    incubator/servicemix/branches/servicemix-4.0/management/acegi/pom.xml
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/java/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/java/org/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/java/org/apache/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/java/org/apache/servicemix/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/java/org/apache/servicemix/management/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/java/org/apache/servicemix/management/acegi/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/java/org/apache/servicemix/management/acegi/AcegiJMXAuthenticator.java
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/resources/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/resources/META-INF/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/resources/META-INF/spring/
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/resources/META-INF/spring/servicemix-management-acegi.xml
    incubator/servicemix/branches/servicemix-4.0/management/core/   (with props)
    incubator/servicemix/branches/servicemix-4.0/management/core/pom.xml
    incubator/servicemix/branches/servicemix-4.0/management/core/src/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/java/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/java/org/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/java/org/apache/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/java/org/apache/servicemix/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/java/org/apache/servicemix/management/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/java/org/apache/servicemix/management/IntrospectionSupport.java   (with props)
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/java/org/apache/servicemix/management/JmxConnectorServiceFactory.java
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/java/org/apache/servicemix/management/RmiRegistryFactoryBean.java
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/java/org/apache/servicemix/management/SimpleAuthenticationManager.java
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/resources/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml
    incubator/servicemix/branches/servicemix-4.0/management/core/src/test/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/test/configs/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/test/configs/factories/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/test/configs/factories/management.properties
    incubator/servicemix/branches/servicemix-4.0/management/core/src/test/configs/services/
    incubator/servicemix/branches/servicemix-4.0/management/core/src/test/configs/services/org.ops4j.pax.logging.properties
    incubator/servicemix/branches/servicemix-4.0/management/pom.xml
Removed:
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/
    incubator/servicemix/branches/servicemix-4.0/daemon/
    incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/felix/
Modified:
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
    incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java
    incubator/servicemix/branches/servicemix-4.0/bundles/cglib/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml
    incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/MessageImpl.java
    incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/ServiceMix.java
    incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml
    incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/servicemix/examples/intermediary/IntermediaryRoutes.java
    incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml
    incubator/servicemix/branches/servicemix-4.0/gshell/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/gshell/gshell-core/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml
    incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/pom.xml
    incubator/servicemix/branches/servicemix-4.0/gshell/pom.xml
    incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
    incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
    incubator/servicemix/branches/servicemix-4.0/jbi/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/main/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/main/pom.xml
    incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java
    incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
    incubator/servicemix/branches/servicemix-4.0/pom.xml
    incubator/servicemix/branches/servicemix-4.0/transaction/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml?rev=587992&r1=587991&r2=587992&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Wed Oct 24 13:03:06 2007
@@ -54,30 +54,10 @@
     <!-- Felix Dependencies -->
     <dependency>
       <groupId>org.apache.servicemix</groupId>
-      <artifactId>org.apache.felix.main</artifactId>
+      <artifactId>org.apache.servicemix.main</artifactId>
       <version>${pom.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>org.apache.felix.daemon</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.shell</artifactId>
-      <version>${felix.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.shell.tui</artifactId>
-      <version>${felix.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.bundlerepository</artifactId>
-      <version>${felix.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-extender</artifactId>
       <version>${spring.osgi.version}</version>
@@ -113,6 +93,11 @@
       <version>${spring.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>org.apache.servicemix.api</artifactId>
       <version>${project.version}</version>
@@ -133,6 +118,31 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>org.apache.servicemix.transaction</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.gshell</groupId>
+      <artifactId>org.apache.servicemix.gshell.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.gshell</groupId>
+      <artifactId>org.apache.servicemix.gshell.osgi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.management</groupId>
+      <artifactId>org.apache.servicemix.management.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.management</groupId>
+      <artifactId>org.apache.servicemix.management.acegi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
       <version>${camel.version}</version>
@@ -144,6 +154,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+      <version>2.1_3-4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>org.apache.servicemix.bundles.jaxb-api</artifactId>
       <version>2.0-4.0-SNAPSHOT</version>
     </dependency>
@@ -165,439 +180,173 @@
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>
       <artifactId>pax-logging-api</artifactId>
-      <version>0.9.6</version>
+      <version>0.9.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>
       <artifactId>pax-logging-service</artifactId>
-      <version>0.9.6</version>
+      <version>0.9.7-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>0.9.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <version>1.1.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
+      <version>1.1.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.configadmin</artifactId>
+      <version>0.9.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.confman</groupId>
+      <artifactId>pax-confman-propsloader</artifactId>
+      <version>0.3.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>
     <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.servicemix</groupId>
+                      <artifactId>org.apache.servicemix.main</artifactId>
+                      <version>${pom.version}</version>
+                      <outputDirectory>target/dependencies</outputDirectory>
+                      <destFileName>servicemix.jar</destFileName>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+        </plugin>
       <plugin>
-        <groupId>org.apache.directory.daemon</groupId>
-        <artifactId>daemon-plugin</artifactId>
-        <version>1.1.0</version>
-        <configuration>
-          <excludes>
-            <exclude>xerces:xercesImpl</exclude>
-			<exclude>aopalliance:aopalliance</exclude>
-			<exclude>commons-logging:commons-logging</exclude>
-            <exclude>org.apache.servicemix:org.apache.felix.main</exclude>
-            <exclude>org.apache.felix:org.apache.felix.framework</exclude>
-            <exclude>org.apache.felix:org.apache.felix.shell</exclude>
-            <exclude>org.apache.felix:org.apache.felix.shell.tui</exclude>
-            <exclude>org.apache.felix:org.apache.felix.bundlerepository</exclude>
-			<exclude>org.apache.felix:org.osgi.core</exclude>
-			<exclude>org.apache.felix.commons:org.apache.felix.commons.commons-logging</exclude>
-            <exclude>org.apache.servicemix:org.apache.servicemix.api</exclude>
-            <exclude>org.apache.servicemix:org.apache.servicemix.core</exclude>
-            <exclude>org.apache.servicemix:org.apache.servicemix.nmr</exclude>
-            <exclude>org.apache.servicemix:org.apache.servicemix.spring</exclude>
-            <exclude>org.apache.servicemix:org.apache.felix.daemon</exclude>
-			<exclude>net.sf.kxml:kxml2</exclude>
-			<exclude>org.springframework:spring-aop</exclude>
-			<exclude>org.springframework:spring-beans</exclude>
-			<exclude>org.springframework:spring-context</exclude>
-			<exclude>org.springframework:spring-core</exclude>
-			<exclude>org.springframework:spring-jmx</exclude>
-			<exclude>org.springframework.osgi:spring-aop</exclude>
-			<exclude>org.springframework.osgi:spring-osgi-core</exclude>
-			<exclude>org.springframework.osgi:spring-osgi-extender</exclude>
-			<exclude>org.springframework.osgi:spring-osgi-io</exclude>
-			<exclude>org.springframework.osgi:aopalliance.osgi</exclude>
-			<exclude>org.springframework.osgi:backport-util-concurrent</exclude>
-			<exclude>xmlpull:xmlpull</exclude>
-	        <!--
-            <exclude>ant:ant</exclude>
-			<exclude>xalan:xalan</exclude>
-			<exclude>org.apache.activemq:activemq-core</exclude>
-			<exclude>org.apache.activemq:activeio-core</exclude>
-            <exclude>org.apache.servicemix.osgi:org.apache.felix.daemon</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.activation</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.commons-logging</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.ejb</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.j2ee-connector</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.j2ee-management</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.jta</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.xbean-server</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.xbean-kernel</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.xbean-classloader</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.xbean-server</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.xbean-spring</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.servicemix-core</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.servicemix-jbi</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.servicemix-services</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.bundles.servicemix-common</exclude>
-            <exclude>org.apache.servicemix.osgi.bundles:org.apache.servicemix.osgi.components.servicemix-eip</exclude>
-			<exclude>org.apache.servicemix.osgi.services:org.apache.servicemix.nmr</exclude>
-			<exclude>org.apache.servicemix.osgi.services:org.apache.servicemix.jmx</exclude>
-			<exclude>org.apache.servicemix:servicemix-core</exclude>
-			<exclude>org.apache.servicemix:servicemix-jbi</exclude>
-			<exclude>org.apache.servicemix:servicemix-services</exclude>
-			<exclude>org.apache.servicemix:servicemix-common</exclude>
-			<exclude>org.apache.servicemix:servicemix-eip</exclude>
-			-->
-			<!--
-			<exclude>org.springframework.osgi:spring-aop</exclude>
-			<exclude>org.springframework.osgi:spring-beans</exclude>
-			<exclude>org.springframework.osgi:spring-context</exclude>
-			<exclude>org.springframework.osgi:spring-core</exclude>
-			<exclude>org.springframework.osgi:spring-jmx</exclude>
-			<exclude>mx4j:mx4j</exclude>
-			<exclude>mx4j:mx4j-remote</exclude>
-			<exclude>backport-util-concurrent:backport-util-concurrent</exclude>
-			<exclude>commons-beanutils:commons-beanutils-core</exclude>
-			<exclude>commons-collections:commons-collections</exclude>
-			<exclude>commons-dbcp:commons-dbcp</exclude>
-			<exclude>commons-lang:commons-lang</exclude>
-			<exclude>commons-logging:commons-logging</exclude>
-			<exclude>commons-pool:commons-pool</exclude>
-			<exclude>org.apache.xbean:xbean-classloader</exclude>
-			<exclude>org.apache.xbean:xbean-kernel</exclude>
-			<exclude>org.apache.xbean:xbean-server</exclude>
-			<exclude>org.apache.xbean:xbean-spring</exclude>
-			<exclude>aopalliance:aopalliance</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-qname_1.1_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-activation_1.1_spec</exclude>
-			<exclude>org.apache.geronimo.modules:geronimo-transaction</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-activation_1.0.2_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-jms_1.1_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-jta_1.1_spec</exclude>
-			<exclude>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</exclude>
-			<exclude>org.apache.geronimo.modules:geronimo-transaction</exclude>
-			<exclude>org.apache.geronimo.modules:geronimo-connector</exclude>
-			<exclude>xstream:xstream</exclude>
-			<exclude>log4j:log4j</exclude>
-			<exclude>xml-apis:xml-apis</exclude>
-			<exclude>logkit:logkit</exclude>
-			<exclude>stax:stax-api</exclude>
-			<exclude>regexp:regexp</exclude>
-			<exclude>junit:junit</exclude>
-			<exclude>org.codehaus.woodstox:wstx-asl</exclude>
-			<exclude>avalon-framework:avalon-framework</exclude>
-			<exclude>jaxen:jaxen</exclude>
-			<exclude>org.jencks:jencks</exclude>
-			<exclude>x.servlet:servlet-api</exclude>
-			<exclude>org.objectweb.howl:howl</exclude>
-			-->
-          </excludes>
-          <application>
-            <name>servicemix</name>
-            <version>${pom.version}</version>
-            <copyrightYear>2007</copyrightYear>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.1</version>
+          <executions>
+            <execution>
+              <id>unix-bin</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+              <configuration>
+                <descriptors>
+                  <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
+                </descriptors>
+                <finalName>${pom.artifactId}-${pom.version}</finalName>
+                <appendAssemblyId>false</appendAssemblyId>
+              </configuration>
+            </execution>
             <!--
-            <minimumVersion>1.5</minimumVersion>
+            <execution>
+              <id>windows-bin</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+              <configuration>
+                <descriptors>
+                  <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
+                </descriptors>
+                <finalName>${pom.artifactId}-${pom.version}</finalName>
+                <appendAssemblyId>false</appendAssemblyId>
+              </configuration>
+            </execution>
+            <execution>
+              <id>unix-src</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+              <configuration>
+                <descriptors>
+                  <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+                </descriptors>
+              </configuration>
+            </execution>
+            <execution>
+              <id>windows-src</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+              <configuration>
+                <descriptors>
+                  <descriptor>src/main/descriptors/windows-src.xml</descriptor>
+                </descriptors>
+              </configuration>
+            </execution>
             -->
-            <url>http://incubator.apache.org/servicemix</url>
-            <email>servicemix-dev@geronimo.apache.org</email>
-            <description>Apache ServiceMix</description>
-            <authors>
-              <author>Apache ServiceMix Team</author>
-              <author>gnodet@apache.org</author>
-            </authors>
-          </application>
-          <packagedFiles>
-            <packagedFile>
-              <filtered>true</filtered>
-              <source>config.properties</source>
-              <destinationPath>conf/config.properties</destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <source>log4j.xml</source>
-              <destinationPath>conf/log4j.xml</destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <source>servicemix.sh</source>
-              <destinationPath>bin/servicemix.sh</destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <source>servicemix.bat</source>
-              <destinationPath>bin/servicemix.bat</destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.servicemix:org.apache.felix.main</source>
-              <destinationPath>
-                bin/servicemix.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.felix:org.apache.felix.shell</source>
-              <destinationPath>
-                bundle/org.apache.felix.shell-${felix.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.felix:org.apache.felix.shell.tui</source>
-              <destinationPath>
-                bundle/org.apache.felix.shell.tui-${felix.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.felix:org.apache.felix.bundlerepository</source>
-              <destinationPath>
-                bundle/org.apache.felix.bundlerepository-${felix.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.springframework.osgi:spring-osgi-extender</source>
-              <destinationPath>
-                bundle/org.springframework.spring-osgi-extender-${spring.osgi.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.springframework.osgi:spring-osgi-core</source>
-              <destinationPath>
-                bundle/org.springframework.spring-osgi-core-${spring.osgi.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.springframework.osgi:spring-osgi-io</source>
-              <destinationPath>
-                bundle/org.springframework.spring-osgi-io-${spring.osgi.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.springframework:spring-context</source>
-              <destinationPath>
-                bundle/org.springframework.spring-context-${spring.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.springframework:spring-beans</source>
-              <destinationPath>
-                bundle/org.springframework.spring-beans-${spring.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.springframework:spring-core</source>
-              <destinationPath>
-                bundle/org.springframework.spring-core-${spring.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.springframework:spring-aop</source>
-              <destinationPath>
-                bundle/org.springframework.spring-aop-${spring.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <source>bundle/telnetd.jar</source>
-              <destinationPath>bundle/telnetd.jar</destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.servicemix:org.apache.servicemix.api</source>
-              <destinationPath>
-                bundle/org.apache.servicemix.api-${project.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.servicemix:org.apache.servicemix.core</source>
-              <destinationPath>
-                bundle/org.apache.servicemix.core-${project.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.servicemix:org.apache.servicemix.spring</source>
-              <destinationPath>
-                bundle/org.apache.servicemix.spring-${project.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.servicemix:org.apache.servicemix.nmr</source>
-              <destinationPath>
-                bundle/org.apache.servicemix.nmr-${project.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.camel:camel-core</source>
-              <destinationPath>
-                bundle/org.apache.camel.core-${camel.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.geronimo.specs:geronimo-activation_1.1_spec</source>
-              <destinationPath>
-                bundle/org.apache.geronimo.specs.activation_1.1_spec-1.0.1-SNAPSHOT.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api</source>
-              <destinationPath>
-                bundle/org.apache.servicemix.bundles.jaxb-api-2.0-${project.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</source>
-              <destinationPath>
-                bundle/org.apache.servicemix.bundles.jaxb-impl-2.0.3-${project.version}.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.ops4j.pax.logging:pax-logging-service</source>
-              <destinationPath>
-                bundle/org.ops4j.pax.logging.service.0.9.6.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.ops4j.pax.logging:pax-logging-api</source>
-              <destinationPath>
-                bundle/org.ops4j.pax.logging.api.0.9.6.jar
-              </destinationPath>
-            </packagedFile>
-            <packagedFile>
-              <dependency>true</dependency>
-              <source>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</source>
-              <destinationPath>
-                bundle/org.apache.servicemix.bundles.aopalliance-1.0-${project.version}.jar
-              </destinationPath>
-            </packagedFile>
-          </packagedFiles>
-          <!--
-          <svnBaseUrl>
-            http://svn.apache.org/repos/asf/incubator/felix/trunk
-          </svnBaseUrl>
-          <packageSources>true</packageSources>
-          <packageDocs>true</packageDocs>
-          -->
-          <applicationClass>
-            org.apache.felix.daemon.Service
-          </applicationClass>
-          <rpmTargets>
-            <rpmTarget>
-              <id>linux-jsvc-rpm</id>
-              <rpmSpecificationFile>
-                src/main/installers/rpm-servicemix.spec
-              </rpmSpecificationFile>
-              <finalName>
-                servicemix-${pom.version}-linux-i386.rpm
-              </finalName>
-              <osName>Linux</osName>
-              <osFamily>unix</osFamily>
-              <osArch>i386</osArch>
-              <daemonFramework>jsvc</daemonFramework>
-            </rpmTarget>
-          </rpmTargets>
-          <innoTargets>
-            <innoTarget>
-              <id>windows-xp-procrun</id>
-              <innoConfigurationFile>
-                src/main/installers/inno-servicemix.iss
-              </innoConfigurationFile>
-              <finalName>
-                servicemix-${pom.version}-win32-setup
-              </finalName>
-              <osName>Windows XP</osName>
-              <osFamily>windows</osFamily>
-              <osVersion>5.1</osVersion>
-              <osArch>x86</osArch>
-              <daemonFramework>procrun</daemonFramework>
-            </innoTarget>
-          </innoTargets>
-          <izPackTargets>
-            <izPackTarget>
-              <id>linux-jsvc</id>
-              <izPackInstallFile>
-                src/main/installers/izpack-unix.xml
-              </izPackInstallFile>
-              <izPackShortcutsUnixFile>
-                src/main/installers/unix_shortcuts.xml
-              </izPackShortcutsUnixFile>
-              <finalName>
-                servicemix-${pom.version}-linux-i386-setup.jar
-              </finalName>
-              <osName>Linux</osName>
-              <osFamily>unix</osFamily>
-              <osArch>i386</osArch>
-              <daemonFramework>jsvc</daemonFramework>
-            </izPackTarget>
-            <izPackTarget>
-              <id>solaris-jsvc-sparc</id>
-              <izPackInstallFile>
-                src/main/installers/izpack-unix.xml
-              </izPackInstallFile>
-              <izPackShortcutsUnixFile>
-                src/main/installers/unix_shortcuts.xml
-              </izPackShortcutsUnixFile>
-              <finalName>
-                servicemix-${pom.version}-solaris-sparc-setup.jar
-              </finalName>
-              <osName>sunos</osName>
-              <osFamily>unix</osFamily>
-              <osArch>sparc</osArch>
-              <daemonFramework>jsvc</daemonFramework>
-            </izPackTarget>
-            <izPackTarget>
-              <id>solaris-jsvc-i386</id>
-              <izPackInstallFile>
-                src/main/installers/izpack-unix.xml
-              </izPackInstallFile>
-              <izPackShortcutsUnixFile>
-                src/main/installers/unix_shortcuts.xml
-              </izPackShortcutsUnixFile>
-              <finalName>
-                servicemix-${pom.version}-solaris-i386-setup.jar
-              </finalName>
-              <osName>sunos</osName>
-              <osFamily>unix</osFamily>
-              <osArch>i386</osArch>
-              <daemonFramework>jsvc</daemonFramework>
-            </izPackTarget>
-            <izPackTarget>
-              <id>macosx-jsvc</id>
-              <izPackInstallFile>
-                src/main/installers/izpack-mac.xml
-              </izPackInstallFile>
-              <izPackShortcutsUnixFile>
-                src/main/installers/unix_shortcuts.xml
-              </izPackShortcutsUnixFile>
-              <finalName>
-                servicemix-${pom.version}-macosx-ppc-setup.jar
-              </finalName>
-              <osName>macosx</osName>
-              <osFamily>unix</osFamily>
-              <osArch>ppc</osArch>
-              <daemonFramework>jsvc</daemonFramework>
-            </izPackTarget>
-          </izPackTargets>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+          </executions>
+      </plugin>  
     </plugins>
   </build>
+
+    <profiles>
+        <profile>
+          <id>assembly-src</id>
+          <build>
+            <plugins>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.1</version>
+                <executions>
+                  <execution>
+                    <id>unix-src</id>
+                    <phase>package</phase>
+                    <goals>
+                      <goal>attached</goal>
+                    </goals>
+                    <configuration>
+                      <descriptors>
+                        <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+                      </descriptors>
+                    </configuration>
+                  </execution>
+                  <execution>
+                    <id>windows-src</id>
+                    <phase>package</phase>
+                    <goals>
+                      <goal>attached</goal>
+                    </goals>
+                    <configuration>
+                      <descriptors>
+                        <descriptor>src/main/descriptors/windows-src.xml</descriptor>
+                      </descriptors>
+                    </configuration>
+                  </execution>
+                </executions>
+              </plugin>
+            </plugins>
+          </build>
+        </profile>
+    </profiles>
 </project>
 

Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=587992&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml Wed Oct 24 13:03:06 2007
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<assembly>
+  <id>unix-bin</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+
+    <!-- Copy license and other files from root -->
+    <fileSet>
+        <directory>..</directory>
+        <outputDirectory>/</outputDirectory>
+        <includes>
+            <include>*.txt</include>
+        </includes>
+    </fileSet>
+
+    <!-- Copy over everything that needs to get unix line endings -->
+    <fileSet>
+      <directory>src/main/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+      </excludes>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>bin/macosx/wrapper.conf</include>
+        <include>bin/linux/wrapper.conf</include>
+      </includes>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+
+    <!-- Copy over files that should not get the line endings converted -->
+    <fileSet>
+      <directory>src/main/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>bin/*.jar</include>
+      </includes>
+    </fileSet>
+
+    <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
+    <fileSet>
+      <directory>src/main/release</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>bin/linux/wrapper</include>
+        <include>bin/linux/libwrapper.so</include>
+        <include>bin/macosx/wrapper</include>
+        <include>bin/macosx/libwrapper.jnilib</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- Copy over the files that need unix line endings and also chmod to 755 -->
+    <fileSet>
+      <directory>src/main/release</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>bin/servicemix.sh</include>
+        <include>bin/macosx/servicemix.sh</include>
+        <include>bin/linux/servicemix.sh</include>
+      </includes>
+      <fileMode>0755</fileMode>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+
+    <!-- Copy over jar files -->
+    <fileSet>
+        <directory>target/dependencies</directory>
+        <outputDirectory>/bin/</outputDirectory>
+    </fileSet>
+
+  </fileSets>
+
+    <dependencySets>
+
+        <!-- Mandatory bundles for everything -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <!-- Compendium -->
+                <include>org.apache.felix:org.osgi.compendium</include>
+  		        <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+
+                <!-- PAX Logging -->
+                <include>org.ops4j.pax.logging:pax-logging-api</include>
+                <include>org.ops4j.pax.logging:pax-logging-service</include>
+
+                <!-- PAX config -->
+                <include>org.apache.felix:org.apache.felix.configadmin</include>
+                <include>org.ops4j.pax.confman:pax-confman-propsloader</include>
+
+                <!-- Spring OSGi -->
+                <include>org.springframework:spring-aop</include>
+                <include>org.springframework:spring-beans</include>
+                <include>org.springframework:spring-context</include>
+                <include>org.springframework:spring-core</include>
+                <include>org.springframework.osgi:spring-osgi-core</include>
+                <include>org.springframework.osgi:spring-osgi-extender</include>
+                <include>org.springframework.osgi:spring-osgi-io</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
+
+            </includes>
+        </dependencySet>
+
+        <!-- ServiceMix bundles -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.apache.servicemix:org.apache.servicemix.api</include>
+                <include>org.apache.servicemix:org.apache.servicemix.core</include>
+                <include>org.apache.servicemix:org.apache.servicemix.nmr</include>
+            </includes>
+        </dependencySet>
+
+        <!-- GShell -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+		        <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
+		        <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
+            </includes>
+        </dependencySet>
+
+        <!-- Transaction Manager -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+                <include>org.springframework:spring-tx</include>
+                <include>org.apache.servicemix:org.apache.servicemix.transaction</include>
+            </includes>
+        </dependencySet>
+
+        <!-- Management -->
+        <dependencySet>
+	            <outputDirectory>/bundle</outputDirectory>
+	            <unpack>false</unpack>
+	            <scope>runtime</scope>
+	            <includes>
+	                <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
+	            </includes>
+	        </dependencySet>
+
+    </dependencySets>
+
+</assembly>

Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml?rev=587992&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml Wed Oct 24 13:03:06 2007
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <!-- Binary Files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>src</outputDirectory>
+      <includes>
+        <include>**/*.jpeg</include>
+        <include>**/*.jpg</include>
+        <include>**/*.gif</include>
+        <include>**/*.png</include>
+        <include>**/*.exe</include>
+        <include>**/*.dll</include>
+        <include>**/*.jar</include>
+        <include>**/*.so</include>
+        <include>**/*.ks</include>
+        <include>**/*.ts</include>
+        <include>**/*.keystore</include>
+        <include>**/*.bin</include>
+        <include>**/*.jnilib</include>
+        <include>**/*.cert</include>
+        <include>assembly/src/release/bin/*/wrapper</include>
+      </includes>
+      <excludes>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- Text Files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>src</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <excludes>
+        <exclude>**/*.jpeg</exclude>
+        <exclude>**/*.jpg</exclude>
+        <exclude>**/*.gif</exclude>
+        <exclude>**/*.png</exclude>
+        <exclude>**/*.exe</exclude>
+        <exclude>**/*.dll</exclude>
+        <exclude>**/*.jar</exclude>
+        <exclude>**/*.so</exclude>
+        <exclude>**/*.ks</exclude>
+        <exclude>**/*.ts</exclude>
+        <exclude>**/*.keystore</exclude>
+        <exclude>**/*.bin</exclude>
+        <exclude>**/*.jnilib</exclude>
+        <exclude>**/*.cert</exclude>
+        <exclude>assembly/src/release/bin/*/wrapper</exclude>
+        <exclude>**/target/**</exclude>
+        <exclude>**/build/**</exclude>
+        <!-- exclude>data/**</exclude>
+        <exclude>*/data/**</exclude -->
+        <exclude>activemq-data/**</exclude>
+        <exclude>*/activemq-data/**</exclude>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/.*</exclude>
+        <exclude>**/.*/**</exclude>
+
+        <exclude>**/surefire*</exclude>
+        <exclude>**/svn-commit*</exclude>
+
+        <exclude>**/*.iml</exclude>
+        <exclude>**/*.ipr</exclude>
+        <exclude>**/*.iws</exclude>
+
+        <exclude>**/cobertura.ser</exclude>
+
+      </excludes>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+  </fileSets>
+</assembly>

Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml?rev=587992&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml Wed Oct 24 13:03:06 2007
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<assembly>
+  <id>windows-bin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+
+    <!-- Copy over everything that needs to get dos line endings -->
+    <fileSet>
+      <directory>src/main/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+        <!--<exclude>bin/**</exclude>-->
+      </excludes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+
+    <!-- copy the website docs 
+    <fileSet>
+      <directory>${basedir}/target/website</directory>
+      <outputDirectory>/doc/website</outputDirectory>
+    </fileSet>
+    -->
+
+    <!-- copy the manual docs -->
+    <!--
+    <fileSet>
+      <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
+      <outputDirectory>/doc</outputDirectory>
+      <includes>
+        <include>*.pdf</include>
+      </includes>
+    </fileSet>
+
+    <!-- copy the examples -->
+    <fileSet>
+      <directory>../examples</directory>
+      <outputDirectory>/examples</outputDirectory>
+      <excludes>
+        <!-- disable build and IDEA files -->
+        <exclude>**/*.i*</exclude>
+        <exclude>**/target/</exclude>
+        <exclude>**/target/*</exclude>
+        <exclude>**/*.ser</exclude>
+        <exclude>**/*.log</exclude>
+      </excludes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+
+    <!-- Copy over jar files -->
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>${pom.artifactId}-${pom.version}.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/bin</outputDirectory>
+      <includes>
+        <include>run.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>org.apache.camel:camel-activemq</include>
+        <include>org.apache.camel:camel-atom</include>
+        <include>org.apache.camel:camel-bam</include>
+        <include>org.apache.camel:camel-core</include>
+        <include>org.apache.camel:camel-cxf</include>
+        <include>org.apache.camel:camel-ftp</include>
+        <include>org.apache.camel:camel-http</include>
+        <include>org.apache.camel:camel-ibatis</include>
+        <include>org.apache.camel:camel-irc</include>
+        <include>org.apache.camel:camel-jaxb</include>
+        <include>org.apache.camel:camel-jdbc</include>
+        <include>org.apache.camel:camel-jetty</include>
+        <include>org.apache.camel:camel-jing</include>
+        <include>org.apache.camel:camel-jms</include>
+        <include>org.apache.camel:camel-josql</include>
+        <include>org.apache.camel:camel-jpa</include>
+        <include>org.apache.camel:camel-juel</include>
+        <include>org.apache.camel:camel-mail</include>
+        <include>org.apache.camel:camel-msv</include>
+        <include>org.apache.camel:camel-ognl</include>
+        <include>org.apache.camel:camel-quartz</include>
+        <include>org.apache.camel:camel-rmi</include>
+        <include>org.apache.camel:camel-mina</include>
+        <include>org.apache.camel:camel-saxon</include>
+        <include>org.apache.camel:camel-script</include>
+        <include>org.apache.camel:camel-spring</include>
+        <include>org.apache.camel:camel-xmlbeans</include>
+        <include>org.apache.camel:camel-xmpp</include>
+        <include>org.apache.camel:camel-xstream</include>
+        <include>commons-logging:commons-logging</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib/optional</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>${pom.groupId}:apache-activemq</include>
+        <include>commons-beanutils:commons-beanutils</include>
+        <include>commons-collections:commons-collections</include>
+        <include>commons-httpclient:commons-httpclient</include>
+        <include>commons-dbcp:commons-dbcp</include>
+        <include>commons-pool:commons-pool</include>
+        <include>log4j:log4j</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+        <include>org.apache.xbean:xbean-spring</include>
+        <include>org.springframework:spring</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml?rev=587992&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml Wed Oct 24 13:03:06 2007
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <!-- Binary Files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>src</outputDirectory>
+      <includes>
+        <include>**/*.jpeg</include>
+        <include>**/*.jpg</include>
+        <include>**/*.gif</include>
+        <include>**/*.png</include>
+        <include>**/*.exe</include>
+        <include>**/*.dll</include>
+        <include>**/*.jar</include>
+        <include>**/*.so</include>
+        <include>**/*.ks</include>
+        <include>**/*.ts</include>
+        <include>**/*.keystore</include>
+        <include>**/*.bin</include>
+        <include>**/*.jnilib</include>
+        <include>**/*.cert</include>
+        <include>assembly/src/release/bin/*/wrapper</include>
+      </includes>
+      <excludes>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- Text Files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>src</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <excludes>
+        <exclude>**/*.jpeg</exclude>
+        <exclude>**/*.jpg</exclude>
+        <exclude>**/*.gif</exclude>
+        <exclude>**/*.png</exclude>
+        <exclude>**/*.exe</exclude>
+        <exclude>**/*.dll</exclude>
+        <exclude>**/*.jar</exclude>
+        <exclude>**/*.so</exclude>
+        <exclude>**/*.ks</exclude>
+        <exclude>**/*.ts</exclude>
+        <exclude>**/*.keystore</exclude>
+        <exclude>**/*.bin</exclude>
+        <exclude>**/*.jnilib</exclude>
+        <exclude>**/*.cert</exclude>
+        <exclude>assembly/src/release/bin/*/wrapper</exclude>
+
+        <exclude>**/target/**</exclude>
+        <exclude>**/build/**</exclude>
+        <!-- exclude>data/**</exclude>
+        <exclude>*/data/**</exclude -->
+        <exclude>activemq-data/**</exclude>
+        <exclude>*/activemq-data/**</exclude>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/.*</exclude>
+        <exclude>**/.*/**</exclude>
+
+        <exclude>**/surefire*</exclude>
+        <exclude>**/svn-commit*</exclude>
+
+        <exclude>**/*.iml</exclude>
+        <exclude>**/*.ipr</exclude>
+        <exclude>**/*.iws</exclude>
+
+        <exclude>**/cobertura.ser</exclude>
+
+      </excludes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+  </fileSets>
+</assembly>

Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/libwrapper.so
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/libwrapper.so?rev=587992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/libwrapper.so
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/servicemix.sh
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/servicemix.sh?rev=587992&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/servicemix.sh (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/servicemix.sh Wed Oct 24 13:03:06 2007
@@ -0,0 +1,538 @@
+#! /bin/sh
+
+# ------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ------------------------------------------------------------------------
+
+# Application
+APP_NAME="ServiceMix"
+APP_LONG_NAME="ServiceMix Server"
+ACTIVEMQ_HOME="../.."
+
+# Wrapper
+WRAPPER_CMD="wrapper"
+WRAPPER_CONF="wrapper.conf"
+
+# Priority at which to run the wrapper.  See "man nice" for valid priorities.
+#  nice is only used if a priority is specified.
+PRIORITY=
+
+# Location of the pid file.
+PIDDIR="."
+
+# If uncommented, causes the Wrapper to be shutdown using an anchor file.
+#  When launched with the 'start' command, it will also ignore all INT and
+#  TERM signals.
+#IGNORE_SIGNALS=true
+
+# If specified, the Wrapper will be run as the specified user.
+# IMPORTANT - Make sure that the user has the required privileges to write
+#  the PID file and wrapper.log files.  Failure to be able to write the log
+#  file will cause the Wrapper to exit without any way to write out an error
+#  message.
+# NOTE - This will set the user which is used to run the Wrapper as well as
+#  the JVM and is not useful in situations where a privileged resource or
+#  port needs to be allocated prior to the user being changed.
+#RUN_AS_USER=
+
+# The following two lines are used by the chkconfig command. Change as is
+#  appropriate for your application.  They should remain commented.
+# chkconfig: 2345 20 80
+# description: @app.long.name@
+
+# Do not modify anything beyond this point
+#-----------------------------------------------------------------------------
+
+# Get the fully qualified path to the script
+case $0 in
+    /*)
+        SCRIPT="$0"
+        ;;
+    *)
+        PWD=`pwd`
+        SCRIPT="$PWD/$0"
+        ;;
+esac
+
+# Resolve the true real path without any sym links.
+CHANGED=true
+while [ "X$CHANGED" != "X" ]
+do
+    # Change spaces to ":" so the tokens can be parsed.
+    SCRIPT=`echo $SCRIPT | sed -e 's; ;:;g'`
+    # Get the real path to this script, resolving any symbolic links
+    TOKENS=`echo $SCRIPT | sed -e 's;/; ;g'`
+    REALPATH=
+    for C in $TOKENS; do
+        REALPATH="$REALPATH/$C"
+        while [ -h "$REALPATH" ] ; do
+            LS="`ls -ld "$REALPATH"`"
+            LINK="`expr "$LS" : '.*-> \(.*\)$'`"
+            if expr "$LINK" : '/.*' > /dev/null; then
+                REALPATH="$LINK"
+            else
+                REALPATH="`dirname "$REALPATH"`""/$LINK"
+            fi
+        done
+    done
+    # Change ":" chars back to spaces.
+    REALPATH=`echo $REALPATH | sed -e 's;:; ;g'`
+
+    if [ "$REALPATH" = "$SCRIPT" ]
+    then
+        CHANGED=""
+    else
+        SCRIPT="$REALPATH"
+    fi
+done
+
+# Change the current directory to the location of the script
+cd "`dirname "$REALPATH"`"
+REALDIR=`pwd`
+
+# If the PIDDIR is relative, set its value relative to the full REALPATH to avoid problems if
+#  the working directory is later changed.
+FIRST_CHAR=`echo $PIDDIR | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+    PIDDIR=$REALDIR/$PIDDIR
+fi
+# Same test for WRAPPER_CMD
+FIRST_CHAR=`echo $WRAPPER_CMD | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+    WRAPPER_CMD=$REALDIR/$WRAPPER_CMD
+fi
+# Same test for WRAPPER_CONF
+FIRST_CHAR=`echo $WRAPPER_CONF | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+    WRAPPER_CONF=$REALDIR/$WRAPPER_CONF
+fi
+
+# Process ID
+ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
+PIDFILE="$PIDDIR/$APP_NAME.pid"
+LOCKDIR="/var/lock/subsys"
+LOCKFILE="$LOCKDIR/$APP_NAME"
+pid=""
+
+# Resolve the location of the 'ps' command
+PSEXE="/usr/bin/ps"
+if [ ! -x $PSEXE ]
+then
+    PSEXE="/bin/ps"
+    if [ ! -x $PSEXE ]
+    then
+        echo "Unable to locate 'ps'."
+        echo "Please report this message along with the location of the command on your system."
+        exit 1
+    fi
+fi
+
+# Resolve the os
+DIST_OS=`uname -s | tr [:upper:] [:lower:] | tr -d [:blank:]`
+case "$DIST_OS" in
+    'sunos')
+        DIST_OS="solaris"
+        ;;
+    'hp-ux' | 'hp-ux64')
+        DIST_OS="hpux"
+        ;;
+    'darwin')
+        DIST_OS="macosx"
+        ;;
+    'unix_sv')
+        DIST_OS="unixware"
+        ;;
+esac
+
+# Resolve the architecture
+DIST_ARCH=`uname -p | tr [:upper:] [:lower:] | tr -d [:blank:]`
+if [ "$DIST_ARCH" = "unknown" ]
+then
+    DIST_ARCH=`uname -m | tr [:upper:] [:lower:] | tr -d [:blank:]`
+fi
+case "$DIST_ARCH" in
+    'amd64' | 'ia32' | 'ia64' | 'i386' | 'i486' | 'i586' | 'i686' | 'x86_64')
+        DIST_ARCH="x86"
+        ;;
+    'ip27')
+        DIST_ARCH="mips"
+        ;;
+    'power' | 'powerpc' | 'power_pc' | 'ppc64')
+        DIST_ARCH="ppc"
+        ;;
+    'pa_risc' | 'pa-risc')
+        DIST_ARCH="parisc"
+        ;;
+    'sun4u' | 'sparcv9')
+        DIST_ARCH="sparc"
+        ;;
+    '9000/800')
+        DIST_ARCH="parisc"
+        ;;
+esac
+
+# Decide on the wrapper binary to use.
+# If a 32-bit wrapper binary exists then it will work on 32 or 64 bit
+#  platforms, if the 64-bit binary exists then the distribution most
+#  likely wants to use long names.  Otherwise, look for the default.
+# For macosx, we also want to look for universal binaries.
+WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+if [ -x $WRAPPER_TEST_CMD ]
+then
+    WRAPPER_CMD="$WRAPPER_TEST_CMD"
+else
+    if [ "$DIST_OS" = "macosx" ]
+    then
+        WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-universal-32"
+        if [ -x $WRAPPER_TEST_CMD ]
+        then
+            WRAPPER_CMD="$WRAPPER_TEST_CMD"
+        else
+            WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
+            if [ -x $WRAPPER_TEST_CMD ]
+            then
+                WRAPPER_CMD="$WRAPPER_TEST_CMD"
+            else
+                WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-universal-64"
+                if [ -x $WRAPPER_TEST_CMD ]
+                then
+                    WRAPPER_CMD="$WRAPPER_TEST_CMD"
+                else
+                    if [ ! -x $WRAPPER_CMD ]
+                    then
+                        echo "Unable to locate any of the following binaries:"
+                        echo "  $WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+                        echo "  $WRAPPER_CMD-$DIST_OS-universal-32"
+                        echo "  $WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
+                        echo "  $WRAPPER_CMD-$DIST_OS-universal-64"
+                        echo "  $WRAPPER_CMD"
+                        exit 1
+                    fi
+                fi
+            fi
+        fi
+    else
+        WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
+        if [ -x $WRAPPER_TEST_CMD ]
+        then
+            WRAPPER_CMD="$WRAPPER_TEST_CMD"
+        else
+            if [ ! -x $WRAPPER_CMD ]
+            then
+                echo "Unable to locate any of the following binaries:"
+                echo "  $WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+                echo "  $WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
+                echo "  $WRAPPER_CMD"
+                exit 1
+            fi
+        fi
+    fi
+fi
+ 
+# Build the nice clause
+if [ "X$PRIORITY" = "X" ]
+then
+    CMDNICE=""
+else
+    CMDNICE="nice -$PRIORITY"
+fi
+
+# Build the anchor file clause.
+if [ "X$IGNORE_SIGNALS" = "X" ]
+then
+   ANCHORPROP=
+   IGNOREPROP=
+else
+   ANCHORPROP=wrapper.anchorfile=$ANCHORFILE
+   IGNOREPROP=wrapper.ignore_signals=TRUE
+fi
+
+# Build the lock file clause.  Only create a lock file if the lock directory exists on this platform.
+if [ -d $LOCKDIR ]
+then
+    LOCKPROP=wrapper.lockfile=$LOCKFILE
+else
+    LOCKPROP=
+fi
+
+checkUser() {
+    # Check the configured user.  If necessary rerun this script as the desired user.
+    if [ "X$RUN_AS_USER" != "X" ]
+    then
+        # Resolve the location of the 'id' command
+        IDEXE="/usr/xpg4/bin/id"
+        if [ ! -x $IDEXE ]
+        then
+            IDEXE="/usr/bin/id"
+            if [ ! -x $IDEXE ]
+            then
+                echo "Unable to locate 'id'."
+                echo "Please report this message along with the location of the command on your system."
+                exit 1
+            fi
+        fi
+    
+        if [ "`$IDEXE -u -n`" = "$RUN_AS_USER" ]
+        then
+            # Already running as the configured user.  Avoid password prompts by not calling su.
+            RUN_AS_USER=""
+        fi
+    fi
+    if [ "X$RUN_AS_USER" != "X" ]
+    then
+        # If LOCKPROP and $RUN_AS_USER are defined then the new user will most likely not be
+        # able to create the lock file.  The Wrapper will be able to update this file once it
+        # is created but will not be able to delete it on shutdown.  If $2 is defined then
+        # the lock file should be created for the current command
+        if [ "X$LOCKPROP" != "X" ]
+        then
+            if [ "X$2" != "X" ]
+            then
+                # Resolve the primary group 
+                RUN_AS_GROUP=`groups $RUN_AS_USER | awk '{print $3}' | tail -1`
+                if [ "X$RUN_AS_GROUP" = "X" ]
+                then
+                    RUN_AS_GROUP=RUN_AS_USER
+                fi
+                touch $LOCKFILE
+                chown $RUN_AS_USER:$RUN_AS_GROUP $LOCKFILE
+            fi
+        fi
+
+        # Still want to change users, recurse.  This means that the user will only be
+        #  prompted for a password once.
+        su -m $RUN_AS_USER -c "$REALPATH $1"
+
+        # Now that we are the original user again, we may need to clean up the lock file.
+        if [ "X$LOCKPROP" != "X" ]
+        then
+            getpid
+            if [ "X$pid" = "X" ]
+            then
+                # Wrapper is not running so make sure the lock file is deleted.
+                if [ -f $LOCKFILE ]
+                then
+                    rm $LOCKFILE
+                fi
+            fi
+        fi
+
+        exit 0
+    fi
+}
+
+getpid() {
+    if [ -f $PIDFILE ]
+    then
+        if [ -r $PIDFILE ]
+        then
+            pid=`cat $PIDFILE`
+            if [ "X$pid" != "X" ]
+            then
+                # It is possible that 'a' process with the pid exists but that it is not the
+                #  correct process.  This can happen in a number of cases, but the most
+                #  common is during system startup after an unclean shutdown.
+                # The ps statement below looks for the specific wrapper command running as
+                #  the pid.  If it is not found then the pid file is considered to be stale.
+                pidtest=`$PSEXE -p $pid -o args | grep $WRAPPER_CMD | tail -1`
+                if [ "X$pidtest" = "X" ]
+                then
+                    # This is a stale pid file.
+                    rm -f $PIDFILE
+                    echo "Removed stale pid file: $PIDFILE"
+                    pid=""
+                fi
+            fi
+        else
+            echo "Cannot read $PIDFILE."
+            exit 1
+        fi
+    fi
+}
+
+testpid() {
+    pid=`$PSEXE -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+    if [ "X$pid" = "X" ]
+    then
+        # Process is gone so remove the pid file.
+        rm -f $PIDFILE
+        pid=""
+    fi
+}
+
+console() {
+    echo "Running $APP_LONG_NAME..."
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        COMMAND_LINE="$CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.syslog.ident=$APP_NAME wrapper.pidfile=$PIDFILE $ANCHORPROP $LOCKPROP"
+        exec $COMMAND_LINE
+    else
+        echo "$APP_LONG_NAME is already running."
+        exit 1
+    fi
+}
+ 
+start() {
+    echo "Starting $APP_LONG_NAME..."
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        COMMAND_LINE="$CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.syslog.ident=$APP_NAME wrapper.pidfile=$PIDFILE wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $LOCKPROP"
+        exec $COMMAND_LINE
+    else
+        echo "$APP_LONG_NAME is already running."
+        exit 1
+    fi
+}
+ 
+stopit() {
+    echo "Stopping $APP_LONG_NAME..."
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        echo "$APP_LONG_NAME was not running."
+    else
+        if [ "X$IGNORE_SIGNALS" = "X" ]
+        then
+            # Running so try to stop it.
+            kill $pid
+            if [ $? -ne 0 ]
+            then
+                # An explanation for the failure should have been given
+                echo "Unable to stop $APP_LONG_NAME."
+                exit 1
+            fi
+        else
+            rm -f $ANCHORFILE
+            if [ -f $ANCHORFILE ]
+            then
+                # An explanation for the failure should have been given
+                echo "Unable to stop $APP_LONG_NAME."
+                exit 1
+            fi
+        fi
+
+        # We can not predict how long it will take for the wrapper to
+        #  actually stop as it depends on settings in wrapper.conf.
+        #  Loop until it does.
+        savepid=$pid
+        CNT=0
+        TOTCNT=0
+        while [ "X$pid" != "X" ]
+        do
+            # Show a waiting message every 5 seconds.
+            if [ "$CNT" -lt "5" ]
+            then
+                CNT=`expr $CNT + 1`
+            else
+                echo "Waiting for $APP_LONG_NAME to exit..."
+                CNT=0
+            fi
+            TOTCNT=`expr $TOTCNT + 1`
+
+            sleep 1
+
+            testpid
+        done
+
+        pid=$savepid
+        testpid
+        if [ "X$pid" != "X" ]
+        then
+            echo "Failed to stop $APP_LONG_NAME."
+            exit 1
+        else
+            echo "Stopped $APP_LONG_NAME."
+        fi
+    fi
+}
+
+status() {
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        echo "$APP_LONG_NAME is not running."
+        exit 1
+    else
+        echo "$APP_LONG_NAME is running ($pid)."
+        exit 0
+    fi
+}
+
+dump() {
+    echo "Dumping $APP_LONG_NAME..."
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        echo "$APP_LONG_NAME was not running."
+
+    else
+        kill -3 $pid
+
+        if [ $? -ne 0 ]
+        then
+            echo "Failed to dump $APP_LONG_NAME."
+            exit 1
+        else
+            echo "Dumped $APP_LONG_NAME."
+        fi
+    fi
+}
+
+case "$1" in
+
+    'console')
+        checkUser $1 touchlock
+        console
+        ;;
+
+    'start')
+        checkUser $1 touchlock
+        start
+        ;;
+
+    'stop')
+        checkUser $1
+        stopit
+        ;;
+
+    'restart')
+        checkUser $1 touchlock
+        stopit
+        start
+        ;;
+
+    'status')
+        checkUser $1
+        status
+        ;;
+
+    'dump')
+        checkUser $1
+        dump
+        ;;
+
+    *)
+        echo "Usage: $0 { console | start | stop | restart | status | dump }"
+        exit 1
+        ;;
+esac
+
+exit 0

Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/wrapper
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/wrapper?rev=587992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/wrapper
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/wrapper.conf
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/wrapper.conf?rev=587992&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/wrapper.conf (added)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/linux/wrapper.conf Wed Oct 24 13:03:06 2007
@@ -0,0 +1,138 @@
+# ------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ------------------------------------------------------------------------
+
+#********************************************************************
+# Wrapper Properties
+#********************************************************************
+
+#wrapper.debug=TRUE
+set.default.ACTIVEMQ_HOME=../..
+set.default.ACTIVEMQ_BASE=../..
+wrapper.working.dir=.
+
+# Java Application
+wrapper.java.command=java
+
+# Java Main class.  This class must implement the WrapperListener interface
+#  or guarantee that the WrapperManager class is initialized.  Helper
+#  classes are provided to do this for you.  See the Integration section
+#  of the documentation for details.
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+# Java Classpath (include wrapper.jar)  Add class path elements as
+#  needed starting from 1
+wrapper.java.classpath.1=%ACTIVEMQ_HOME%/bin/wrapper.jar
+wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/run.jar
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/linux/
+
+# Java Additional Parameters
+# note that n is the parameter number starting from 1.
+wrapper.java.additional.1=-Dactivemq.home=%ACTIVEMQ_HOME%
+wrapper.java.additional.2=-Dactivemq.base=%ACTIVEMQ_BASE%
+wrapper.java.additional.3=-Djavax.net.ssl.keyStorePassword=password
+wrapper.java.additional.4=-Djavax.net.ssl.trustStorePassword=password
+wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.ks
+wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
+wrapper.java.additional.7=-Dcom.sun.management.jmxremote
+wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
+wrapper.java.additional.9=-Dderby.storage.fileSyncTransactionLog=true
+
+# Uncomment to enable jmx
+#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 
+#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.authenticate=false 
+#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.ssl=false
+
+# Uncomment to enable YourKit profiling
+#wrapper.java.additional.n=-Xrunyjpagent
+
+# Uncomment to enable remote debugging
+#wrapper.java.additional.n=-Xdebug -Xnoagent -Djava.compiler=NONE 
+#wrapper.java.additional.n=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+
+# Initial Java Heap Size (in MB)
+#wrapper.java.initmemory=3
+
+# Maximum Java Heap Size (in MB)
+wrapper.java.maxmemory=512
+
+# Application parameters.  Add parameters as needed starting from 1
+wrapper.app.parameter.1=org.apache.activemq.console.Main
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Format of output for the console.  (See docs for formats)
+wrapper.console.format=PM
+
+# Log Level for console output.  (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=%ACTIVEMQ_BASE%/activemq-data/wrapper.log
+
+# Format of output for the log file.  (See docs for formats)
+wrapper.logfile.format=LPTM
+
+# Log Level for log file output.  (See docs for log levels)
+wrapper.logfile.loglevel=INFO
+
+# Maximum size that the log file will be allowed to grow to before
+#  the log is rolled. Size is specified in bytes.  The default value
+#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
+#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize=0
+
+# Maximum number of rolled log files which will be allowed before old
+#  files are deleted.  The default value of 0 implies no limit.
+wrapper.logfile.maxfiles=0
+
+# Log Level for sys/event log output.  (See docs for log levels)
+wrapper.syslog.loglevel=NONE
+
+#********************************************************************
+# Wrapper Windows Properties
+#********************************************************************
+# Title to use when running as a console
+wrapper.console.title=ActiveMQ
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+#  using this configuration file has been installed as a service.
+#  Please uninstall the service before modifying this section.  The
+#  service can then be reinstalled.
+
+# Name of the service
+wrapper.ntservice.name=ActiveMQ
+
+# Display name of the service
+wrapper.ntservice.displayname=ActiveMQ
+
+# Description of the service
+wrapper.ntservice.description=ActiveMQ Broker
+
+# Service dependencies.  Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed.  AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false

Added: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/macosx/libwrapper.jnilib
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/macosx/libwrapper.jnilib?rev=587992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/macosx/libwrapper.jnilib
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message