You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2010/10/12 21:18:21 UTC
svn commit: r1021887 [3/3] - in /servicemix/smx3/trunk:
core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/
distributions/apache-servicemix/
distributions/apache-servicemix/src/main/assembly/
distributions/apache-servicemix/src/main...
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml?rev=1021887&r1=1021886&r2=1021887&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml Tue Oct 12 19:18:20 2010
@@ -18,174 +18,175 @@
-->
<assembly>
- <id></id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>DISCLAIMER</include>
- <include>RELEASE-NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/filtered</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>bin/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/filtered/bin</directory>
- <outputDirectory>/bin/</outputDirectory>
- <excludes>
- <exclude>*.bat</exclude>
- </excludes>
- <fileMode>0755</fileMode>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <fileSet>
- <directory>target/classes/conf</directory>
- <outputDirectory>/conf</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/filtered/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <fileMode>755</fileMode>
- <excludes>
- <exclude>*.bat</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/components</directory>
- <outputDirectory>hotdeploy</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/schemas</directory>
- <outputDirectory>schemas</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/servicemix-web-${pom.version}</directory>
- <outputDirectory>examples/servicemix-web</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/wsdl-first-${pom.version}</directory>
- <outputDirectory>examples/wsdl-first</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/cxf-wsdl-first-${pom.version}</directory>
- <outputDirectory>examples/cxf-wsdl-first</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/loan-broker-${pom.version}</directory>
- <outputDirectory>examples/loan-broker-bpel</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/bridge-${pom.version}</directory>
- <outputDirectory>examples/bridge</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/bridge-camel-${pom.version}</directory>
- <outputDirectory>examples/bridge-camel</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/basic-${pom.version}</directory>
- <outputDirectory>examples/basic</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/camel-${pom.version}</directory>
- <outputDirectory>examples/camel</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/dummy</directory>
- <outputDirectory>lib/optional</outputDirectory>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>extras</outputDirectory>
- <includes>
- <include>org.apache.servicemix:servicemix-components</include>
- <include>org.apache.servicemix:servicemix-beanflow</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>classworlds:classworlds</include>
- <include>backport-util-concurrent:backport-util-concurrent</include>
- <include>org.apache.activemq:activemq-core</include>
- <include>org.apache.activemq:activemq-ra</include>
- <include>org.apache.activemq:activemq-pool</include>
- <include>org.apache.activemq:kahadb</include>
- <include>org.apache.activemq:activeio-core</include>
- <include>commons-logging:commons-logging</include>
- <include>commons-beanutils:commons-beanutils-core</include>
- <include>commons-lang:commons-lang</include>
- <include>commons-io:commons-io</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jbi-api-1.0</include>
- <include>org.apache.servicemix:servicemix-core</include>
- <include>org.apache.servicemix:servicemix-audit</include>
- <include>org.apache.servicemix:servicemix-utils</include>
- <include>org.apache.xbean:xbean-spring</include>
- <include>org.apache.xbean:xbean-classloader</include>
- <include>wsdl4j:wsdl4j</include>
- <include>org.apache.woden:woden</include>
- <include>org.springframework:spring-aop</include>
- <include>org.springframework:spring-asm</include>
- <include>org.springframework:spring-core</include>
- <include>org.springframework:spring-beans</include>
- <include>org.springframework:spring-context</include>
- <include>org.springframework:spring-expression</include>
- <include>org.springframework:spring-tx</include>
- <include>aopalliance:aopalliance</include>
- <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_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.geronimo.specs:geronimo-ejb_2.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-servlet_2.4_spec</include>
-
- <include>org.jencks:jencks</include>
- <include>org.objectweb.howl:howl</include>
-
- <include>org.apache.geronimo.components:geronimo-connector</include>
- <include>org.apache.geronimo.components:geronimo-transaction</include>
- <include>org.slf4j:slf4j-api</include>
- <include>org.slf4j:slf4j-simple</include>
-
- <include>javax.activation:activation</include>
- <include>javax.mail:mail</include>
-
- <include>com.thoughtworks.xstream:xstream</include>
- <include>xerces:xercesImpl</include>
- <include>xalan:xalan</include>
-
- <include>javax.xml.stream:stax-api</include>
- <include>org.codehaus.woodstox:woodstox-core-asl</include>
- <include>org.codehaus.woodstox:stax2-api</include>
- <include>xml-apis:xml-apis</include>
- <include>log4j:log4j</include>
- <include>org.apache.derby:derby</include>
- </includes>
- </dependencySet>
- <!-- dependency Set added by ka, 15.08.2006 -->
- <dependencySet>
- <outputDirectory>lib/optional</outputDirectory>
- <includes>
- <include>commons-pool:commons-pool</include>
- <include>commons-collections:commons-collections</include>
- </includes>
- </dependencySet>
+ <id></id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>DISCLAIMER</include>
+ <include>RELEASE-NOTES</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/filtered</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/filtered/bin</directory>
+ <outputDirectory>/bin/</outputDirectory>
+ <excludes>
+ <exclude>*.bat</exclude>
+ </excludes>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/conf</directory>
+ <outputDirectory>/conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/filtered/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <fileMode>755</fileMode>
+ <excludes>
+ <exclude>*.bat</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/components</directory>
+ <outputDirectory>hotdeploy</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/schemas</directory>
+ <outputDirectory>schemas</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/servicemix-web-${pom.version}</directory>
+ <outputDirectory>examples/servicemix-web</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/wsdl-first-${pom.version}</directory>
+ <outputDirectory>examples/wsdl-first</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/cxf-wsdl-first-${pom.version}</directory>
+ <outputDirectory>examples/cxf-wsdl-first</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/loan-broker-${pom.version}</directory>
+ <outputDirectory>examples/loan-broker-bpel</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/bridge-${pom.version}</directory>
+ <outputDirectory>examples/bridge</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/bridge-camel-${pom.version}</directory>
+ <outputDirectory>examples/bridge-camel</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/basic-${pom.version}</directory>
+ <outputDirectory>examples/basic</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/camel-${pom.version}</directory>
+ <outputDirectory>examples/camel</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/dummy</directory>
+ <outputDirectory>lib/optional</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>extras</outputDirectory>
+ <includes>
+ <include>org.apache.servicemix:servicemix-components</include>
+ <include>org.apache.servicemix:servicemix-beanflow</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>classworlds:classworlds</include>
+ <include>backport-util-concurrent:backport-util-concurrent</include>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.activemq:activemq-ra</include>
+ <include>org.apache.activemq:activemq-pool</include>
+ <include>org.apache.activemq:kahadb</include>
+ <include>org.apache.activemq:activeio-core</include>
+ <include>commons-logging:commons-logging</include>
+ <include>commons-beanutils:commons-beanutils-core</include>
+ <include>commons-lang:commons-lang</include>
+ <include>commons-io:commons-io</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jbi-api-1.0</include>
+ <include>org.apache.servicemix:servicemix-core</include>
+ <include>org.apache.servicemix:servicemix-audit</include>
+ <include>org.apache.servicemix:servicemix-utils</include>
+ <include>org.apache.xbean:xbean-spring</include>
+ <include>org.apache.xbean:xbean-classloader</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>org.apache.woden:woden</include>
+ <include>org.springframework:spring-aop</include>
+ <include>org.springframework:spring-asm</include>
+ <include>org.springframework:spring-core</include>
+ <include>org.springframework:spring-beans</include>
+ <include>org.springframework:spring-context</include>
+ <include>org.springframework:spring-expression</include>
+ <include>org.springframework:spring-tx</include>
+ <include>aopalliance:aopalliance</include>
+ <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_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.geronimo.specs:geronimo-ejb_2.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-servlet_2.4_spec</include>
+
+ <include>org.jencks:jencks</include>
+ <include>org.objectweb.howl:howl</include>
+
+ <include>org.apache.geronimo.components:geronimo-connector</include>
+ <include>org.apache.geronimo.components:geronimo-transaction</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-simple</include>
+
+ <include>javax.activation:activation</include>
+ <include>javax.mail:mail</include>
+
+ <include>com.thoughtworks.xstream:xstream</include>
+ <include>xerces:xercesImpl</include>
+ <include>xalan:xalan</include>
+
+ <include>javax.xml.stream:stax-api</include>
+ <include>org.codehaus.woodstox:woodstox-core-asl</include>
+ <include>org.codehaus.woodstox:stax2-api</include>
+ <include>xml-apis:xml-apis</include>
+ <include>log4j:log4j</include>
+ <include>org.apache.derby:derby</include>
+ <include>org.fusesource.commonman:commons-management</include>
+ </includes>
+ </dependencySet>
+ <!-- dependency Set added by ka, 15.08.2006 -->
+ <dependencySet>
+ <outputDirectory>lib/optional</outputDirectory>
+ <includes>
+ <include>commons-pool:commons-pool</include>
+ <include>commons-collections:commons-collections</include>
+ </includes>
+ </dependencySet>
<!--
<dependencySet>
<outputDirectory>lib/optional</outputDirectory>
@@ -211,5 +212,5 @@
</includes>
</dependencySet>
-->
- </dependencySets>
+ </dependencySets>
</assembly>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml?rev=1021887&r1=1021886&r2=1021887&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml Tue Oct 12 19:18:20 2010
@@ -18,166 +18,167 @@
-->
<assembly>
- <id></id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>DISCLAIMER</include>
- <include>RELEASE-NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/filtered</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>bin/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/filtered/bin</directory>
- <outputDirectory>/bin/</outputDirectory>
- <includes>
- <include>*.bat</include>
- </includes>
- <fileMode>0755</fileMode>
- <lineEnding>dos</lineEnding>
- </fileSet>
- <fileSet>
- <directory>target/classes/conf</directory>
- <outputDirectory>/conf</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/components</directory>
- <outputDirectory>hotdeploy</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/schemas</directory>
- <outputDirectory>schemas</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/servicemix-web-${pom.version}</directory>
- <outputDirectory>examples/servicemix-web</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/wsdl-first-${pom.version}</directory>
- <outputDirectory>examples/wsdl-first</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/cxf-wsdl-first-${pom.version}</directory>
- <outputDirectory>examples/cxf-wsdl-first</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/loan-broker-${pom.version}</directory>
- <outputDirectory>examples/loan-broker-bpel</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/bridge-${pom.version}</directory>
- <outputDirectory>examples/bridge</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/bridge-camel-${pom.version}</directory>
- <outputDirectory>examples/bridge-camel</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/basic-${pom.version}</directory>
- <outputDirectory>examples/basic</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/camel-${pom.version}</directory>
- <outputDirectory>examples/camel</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/dummy</directory>
- <outputDirectory>lib/optional</outputDirectory>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>extras</outputDirectory>
- <includes>
- <include>org.apache.servicemix:servicemix-components</include>
- <include>org.apache.servicemix:servicemix-beanflow</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>classworlds:classworlds</include>
- <include>backport-util-concurrent:backport-util-concurrent</include>
- <include>org.apache.activemq:activemq-core</include>
- <include>org.apache.activemq:activemq-ra</include>
- <include>org.apache.activemq:activemq-pool</include>
- <include>org.apache.activemq:kahadb</include>
- <include>org.apache.activemq:activeio-core</include>
- <include>commons-logging:commons-logging</include>
- <include>commons-beanutils:commons-beanutils-core</include>
- <include>commons-lang:commons-lang</include>
- <include>commons-io:commons-io</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jbi-api-1.0</include>
- <include>org.apache.servicemix:servicemix-core</include>
- <include>org.apache.servicemix:servicemix-audit</include>
- <include>org.apache.servicemix:servicemix-utils</include>
- <include>org.apache.xbean:xbean-spring</include>
- <include>org.apache.xbean:xbean-classloader</include>
- <include>wsdl4j:wsdl4j</include>
- <include>org.apache.woden:woden</include>
- <include>org.springframework:spring-aop</include>
- <include>org.springframework:spring-asm</include>
- <include>org.springframework:spring-core</include>
- <include>org.springframework:spring-beans</include>
- <include>org.springframework:spring-context</include>
- <include>org.springframework:spring-expression</include>
- <include>org.springframework:spring-tx</include>
- <include>aopalliance:aopalliance</include>
- <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_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.geronimo.specs:geronimo-ejb_2.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-servlet_2.4_spec</include>
-
- <include>org.jencks:jencks</include>
- <include>org.objectweb.howl:howl</include>
-
- <include>org.apache.geronimo.components:geronimo-connector</include>
- <include>org.apache.geronimo.components:geronimo-transaction</include>
- <include>org.slf4j:slf4j-api</include>
- <include>org.slf4j:slf4j-simple</include>
-
- <include>javax.activation:activation</include>
- <include>javax.mail:mail</include>
-
- <include>com.thoughtworks.xstream:xstream</include>
- <include>xerces:xercesImpl</include>
- <include>xalan:xalan</include>
-
- <include>javax.xml.stream:stax-api</include>
- <include>org.codehaus.woodstox:woodstox-core-asl</include>
- <include>org.codehaus.woodstox:stax2-api</include>
- <include>xml-apis:xml-apis</include>
- <include>log4j:log4j</include>
- <include>org.apache.derby:derby</include>
- </includes>
- </dependencySet>
- <!-- dependency Set added by ka, 15.08.2006 -->
- <dependencySet>
- <outputDirectory>lib/optional</outputDirectory>
- <includes>
- <include>commons-pool:commons-pool</include>
- <include>commons-collections:commons-collections</include>
- </includes>
- </dependencySet>
+ <id></id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>DISCLAIMER</include>
+ <include>RELEASE-NOTES</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/filtered</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/filtered/bin</directory>
+ <outputDirectory>/bin/</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/conf</directory>
+ <outputDirectory>/conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/components</directory>
+ <outputDirectory>hotdeploy</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/schemas</directory>
+ <outputDirectory>schemas</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/servicemix-web-${pom.version}</directory>
+ <outputDirectory>examples/servicemix-web</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/wsdl-first-${pom.version}</directory>
+ <outputDirectory>examples/wsdl-first</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/cxf-wsdl-first-${pom.version}</directory>
+ <outputDirectory>examples/cxf-wsdl-first</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/loan-broker-${pom.version}</directory>
+ <outputDirectory>examples/loan-broker-bpel</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/bridge-${pom.version}</directory>
+ <outputDirectory>examples/bridge</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/bridge-camel-${pom.version}</directory>
+ <outputDirectory>examples/bridge-camel</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/basic-${pom.version}</directory>
+ <outputDirectory>examples/basic</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/samples/camel-${pom.version}</directory>
+ <outputDirectory>examples/camel</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/dummy</directory>
+ <outputDirectory>lib/optional</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>extras</outputDirectory>
+ <includes>
+ <include>org.apache.servicemix:servicemix-components</include>
+ <include>org.apache.servicemix:servicemix-beanflow</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>classworlds:classworlds</include>
+ <include>backport-util-concurrent:backport-util-concurrent</include>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.activemq:activemq-ra</include>
+ <include>org.apache.activemq:activemq-pool</include>
+ <include>org.apache.activemq:kahadb</include>
+ <include>org.apache.activemq:activeio-core</include>
+ <include>commons-logging:commons-logging</include>
+ <include>commons-beanutils:commons-beanutils-core</include>
+ <include>commons-lang:commons-lang</include>
+ <include>commons-io:commons-io</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jbi-api-1.0</include>
+ <include>org.apache.servicemix:servicemix-core</include>
+ <include>org.apache.servicemix:servicemix-audit</include>
+ <include>org.apache.servicemix:servicemix-utils</include>
+ <include>org.apache.xbean:xbean-spring</include>
+ <include>org.apache.xbean:xbean-classloader</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>org.apache.woden:woden</include>
+ <include>org.springframework:spring-aop</include>
+ <include>org.springframework:spring-asm</include>
+ <include>org.springframework:spring-core</include>
+ <include>org.springframework:spring-beans</include>
+ <include>org.springframework:spring-context</include>
+ <include>org.springframework:spring-expression</include>
+ <include>org.springframework:spring-tx</include>
+ <include>aopalliance:aopalliance</include>
+ <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_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.geronimo.specs:geronimo-ejb_2.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-servlet_2.4_spec</include>
+
+ <include>org.jencks:jencks</include>
+ <include>org.objectweb.howl:howl</include>
+
+ <include>org.apache.geronimo.components:geronimo-connector</include>
+ <include>org.apache.geronimo.components:geronimo-transaction</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-simple</include>
+
+ <include>javax.activation:activation</include>
+ <include>javax.mail:mail</include>
+
+ <include>com.thoughtworks.xstream:xstream</include>
+ <include>xerces:xercesImpl</include>
+ <include>xalan:xalan</include>
+
+ <include>javax.xml.stream:stax-api</include>
+ <include>org.codehaus.woodstox:woodstox-core-asl</include>
+ <include>org.codehaus.woodstox:stax2-api</include>
+ <include>xml-apis:xml-apis</include>
+ <include>log4j:log4j</include>
+ <include>org.apache.derby:derby</include>
+ <include>org.fusesource.commonman:commons-management</include>
+ </includes>
+ </dependencySet>
+ <!-- dependency Set added by ka, 15.08.2006 -->
+ <dependencySet>
+ <outputDirectory>lib/optional</outputDirectory>
+ <includes>
+ <include>commons-pool:commons-pool</include>
+ <include>commons-collections:commons-collections</include>
+ </includes>
+ </dependencySet>
<!--
<dependencySet>
<outputDirectory>lib/optional</outputDirectory>
@@ -203,5 +204,5 @@
</includes>
</dependencySet>
-->
- </dependencySets>
+ </dependencySets>
</assembly>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml?rev=1021887&r1=1021886&r2=1021887&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml Tue Oct 12 19:18:20 2010
@@ -27,84 +27,84 @@
http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core.xsd
http://servicemix.apache.org/audit/1.0 http://servicemix.apache.org/schema/servicemix-audit.xsd">
- <!-- System properties -->
- <sm:systemProperties>
- <property name="properties">
- <map>
- <entry key="java.security.auth.login.config">
- <bean class="org.springframework.util.ResourceUtils" factory-method="getFile">
- <constructor-arg value="classpath:login.properties"/>
- </bean>
- </entry>
- </map>
- </property>
- </sm:systemProperties>
-
- <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location" value="classpath:servicemix.properties" />
- </bean>
-
- <!-- Include other resources -->
- <import resource="classpath:security.xml" />
- <import resource="classpath:jmx.xml" />
- <import resource="classpath:activemq.xml" />
- <import resource="classpath:tx.xml" />
- <import resource="classpath:jndi.xml" />
-
- <!-- the JBI container -->
- <sm:container id="jbi"
- rootDir="./data/smx"
- MBeanServer="#jmxServer"
- installationDirPath="./hotdeploy"
- monitorDeploymentDirectory="false"
- monitorInterval="1"
- transactionManager="#transactionManager"
- createJmxConnector="false">
-
- <sm:activationSpecs/>
-
- <!-- Use a secured broker (see security.xml)
- and define the 3 standard flows -->
- <sm:broker>
- <sm:securedBroker authorizationMap="#authorizationMap">
- <sm:flows>
- <sm:sedaFlow />
- <sm:jmsFlow jmsURL="${activemq.url}" />
- <sm:jcaFlow connectionManager="#connectionManager"
- jmsURL="${activemq.url}" />
- </sm:flows>
- </sm:securedBroker>
- </sm:broker>
-
- <sm:executorFactory>
- <bean class="org.apache.servicemix.executors.impl.ExecutorFactoryImpl">
- <property name="defaultConfig">
- <bean class="org.apache.servicemix.executors.impl.ExecutorConfig">
- <property name="corePoolSize" value="${servicemix.corePoolSize}"/>
- <property name="maximumPoolSize" value="${servicemix.maximumPoolSize}"/>
- <property name="queueSize" value="${servicemix.queueSize}"/>
- </bean>
+ <!-- System properties -->
+ <sm:systemProperties>
+ <property name="properties">
+ <map>
+ <entry key="java.security.auth.login.config">
+ <bean class="org.springframework.util.ResourceUtils" factory-method="getFile">
+ <constructor-arg value="classpath:login.properties"/>
+ </bean>
+ </entry>
+ </map>
</property>
- </bean>
- </sm:executorFactory>
+ </sm:systemProperties>
+
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:servicemix.properties"/>
+ </bean>
+
+ <!-- Include other resources -->
+ <import resource="classpath:security.xml"/>
+ <import resource="classpath:jmx.xml"/>
+ <import resource="classpath:activemq.xml"/>
+ <import resource="classpath:tx.xml"/>
+ <import resource="classpath:jndi.xml"/>
+
+ <!-- the JBI container -->
+ <sm:container id="jbi"
+ rootDir="./data/smx"
+ MBeanServer="#jmxServer"
+ installationDirPath="./hotdeploy"
+ monitorDeploymentDirectory="false"
+ monitorInterval="1"
+ transactionManager="#transactionManager"
+ createJmxConnector="false">
+
+ <sm:activationSpecs/>
+
+ <!-- Use a secured broker (see security.xml)
+ and define the 3 standard flows -->
+ <sm:broker>
+ <sm:securedBroker authorizationMap="#authorizationMap">
+ <sm:flows>
+ <sm:sedaFlow/>
+ <sm:jmsFlow jmsURL="${activemq.url}"/>
+ <sm:jcaFlow connectionManager="#connectionManager"
+ jmsURL="${activemq.url}"/>
+ </sm:flows>
+ </sm:securedBroker>
+ </sm:broker>
+
+ <sm:executorFactory>
+ <bean class="org.apache.servicemix.executors.impl.ExecutorFactoryImpl" mbeanServer="#jmxServer">
+ <property name="defaultConfig">
+ <bean class="org.apache.servicemix.executors.impl.ExecutorConfig">
+ <property name="corePoolSize" value="${servicemix.corePoolSize}"/>
+ <property name="maximumPoolSize" value="${servicemix.maximumPoolSize}"/>
+ <property name="queueSize" value="${servicemix.queueSize}"/>
+ </bean>
+ </property>
+ </bean>
+ </sm:executorFactory>
- <sm:services>
- <sm:statistics statsInterval="10" dumpStats="true" />
- </sm:services>
-
- </sm:container>
-
- <audit:jdbcAuditor container="#jbi" autoStart="false">
- <audit:dataSource>
- <bean class="org.apache.derby.jdbc.EmbeddedDataSource">
- <property name="databaseName" value="servicemixDB"/>
- <property name="createDatabase" value="create"/>
- </bean>
- </audit:dataSource>
- </audit:jdbcAuditor>
+ <sm:services>
+ <sm:statistics statsInterval="10" dumpStats="true"/>
+ </sm:services>
+
+ </sm:container>
+
+ <audit:jdbcAuditor container="#jbi" autoStart="false">
+ <audit:dataSource>
+ <bean class="org.apache.derby.jdbc.EmbeddedDataSource">
+ <property name="databaseName" value="servicemixDB"/>
+ <property name="createDatabase" value="create"/>
+ </bean>
+ </audit:dataSource>
+ </audit:jdbcAuditor>
- <sm:dotViewService container="#jbi" autoStart="true" />
+ <sm:dotViewService container="#jbi" autoStart="true"/>
- <sm:logService container="#jbi" autoStart="true" refreshPeriod="60" />
+ <sm:logService container="#jbi" autoStart="true" refreshPeriod="60"/>
</beans>