You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/08/25 17:55:16 UTC
svn commit: r688767 [1/2] - in /tuscany/java/sca/distribution/features:
all/src/main/assembly/ core/ core/src/main/assembly/
core/src/main/components/ ejava/src/main/assembly/
ejava/src/main/components/ etc/ manager/ manager/src/main/assembly/
manager/...
Author: jsdelfino
Date: Mon Aug 25 08:55:15 2008
New Revision: 688767
URL: http://svn.apache.org/viewvc?rev=688767&view=rev
Log:
Simplified the distribution builds, use Maven assembly component descriptors to share definitions. Added a few scripts to help maintain some of the descriptors, eventually they should be converted to Maven plugins.
Added:
tuscany/java/sca/distribution/features/core/src/main/components/
tuscany/java/sca/distribution/features/core/src/main/components/bin-common.xml
tuscany/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml
tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml
tuscany/java/sca/distribution/features/core/src/main/components/bin-samples.xml
tuscany/java/sca/distribution/features/core/src/main/components/src-common.xml
tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml
- copied, changed from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/ejava/src/main/components/
tuscany/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml
tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml
- copied, changed from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh (with props)
tuscany/java/sca/distribution/features/etc/generate-maven-files.sh (with props)
tuscany/java/sca/distribution/features/etc/generate-src-modules.sh (with props)
tuscany/java/sca/distribution/features/manager/src/main/components/
tuscany/java/sca/distribution/features/manager/src/main/components/bin-samples.xml
tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml
- copied, changed from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/process/src/main/components/
tuscany/java/sca/distribution/features/process/src/main/components/bin-samples.xml
tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml
- copied, changed from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/web20/src/main/components/
tuscany/java/sca/distribution/features/web20/src/main/components/bin-samples.xml
tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml
- copied, changed from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/webservice/src/main/components/
tuscany/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml
tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml
- copied, changed from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml
Modified:
tuscany/java/sca/distribution/features/all/src/main/assembly/bin.xml
tuscany/java/sca/distribution/features/all/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/core/pom.xml
tuscany/java/sca/distribution/features/core/src/main/assembly/bin.xml
tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml
tuscany/java/sca/distribution/features/ejava/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/etc/generate-pom.sh
tuscany/java/sca/distribution/features/manager/pom.xml
tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml
tuscany/java/sca/distribution/features/manager/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/process/pom.xml
tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml
tuscany/java/sca/distribution/features/process/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml
tuscany/java/sca/distribution/features/web20/src/main/assembly/src.xml
tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml
tuscany/java/sca/distribution/features/webservice/src/main/assembly/src.xml
Modified: tuscany/java/sca/distribution/features/all/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/all/src/main/assembly/bin.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/all/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/all/src/main/assembly/bin.xml Mon Aug 25 08:55:15 2008
@@ -30,119 +30,14 @@
<format>zip</format>
</formats>
- <fileSets>
-
- <!-- Add the text files to the top-level directroy -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>DISCLAIMER</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/bin</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
-
- <!-- Add the node launcher webapp to the modules directory -->
- <fileSet>
- <directory>../../sca/modules/node2-launcher-webapp/target</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>*.war</include>
- </includes>
- </fileSet>
-
- <!-- Add samples to the samples directory -->
- <fileSet>
- <directory>../../sca/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
-
- <!-- Base samples -->
- <include>calculator/**/*</include>
- <include>binding-echo/**/*</include>
- <include>binding-echo-extension/**/*</include>
- <include>databinding-echo/**/*</include>
- <include>implementation-composite/**/*</include>
- <include>implementation-crud/**/*</include>
- <include>implementation-crud-extension/**/*</include>
- <include>implementation-pojo-extension/**/*</include>
- <include>loanapplication/**/*</include>
- <include>simple-bigbank/**/*</include>
- <include>simple-callback/**/*</include>
- <include>supplychain/**/*</include>
- <include>domain-management/**/*</include>
-
- <!-- JEE samples -->
- <include>helloworld-bpel/**/*</include>
- <include>helloworld-bpel-ws/**/*</include>
- <include>quote-xquery/**/*</include>
-
- <!-- Management samples -->
- <include>domain-management/**/*</include>
-
- <!-- Process samples -->
- <include>helloworld-bpel/**/*</include>
- <include>helloworld-bpel-ws/**/*</include>
- <include>quote-xquery/**/*</include>
-
- <!-- Web 2.0 samples -->
- <include>feed-aggregator/**/*</include>
- <include>store/**/*</include>
- <include>web-resource/**/*</include>
-
- <!-- Web Service samples -->
- <include>callback-ws-client/**/*</include>
- <include>callback-ws-service/**/*</include>
- <include>helloworld-ws-reference/**/*</include>
- <include>helloworld-ws-service/**/*</include>
- <include>helloworld-ws-reference-secure/**/*</include>
- <include>helloworld-ws-service-secure/**/*</include>
- <include>simple-callback-ws/**/*</include>
- <include>zipcode-jaxws/**/*</include>
- </includes>
- <excludes>
- <!-- General file/folders to exclude -->
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/*.log</exclude>
-
- <!-- Sample specific files/folders to exclude -->
- <exclude>pom.xml</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
-
- <!-- Add all the Tuscany modules to the modules directory -->
- <dependencySet>
- <outputDirectory>modules</outputDirectory>
- <unpack>false</unpack>
- <includes>
- <include>org.apache.tuscany.sca:*</include>
- </includes>
- </dependencySet>
-
- <!-- Add all the dependent jars to the lib directory -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <excludes>
- <exclude>org.apache.tuscany.sca:*</exclude>
- </excludes>
- </dependencySet>
-
- </dependencySets>
-
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/bin-dependencies.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
+ <componentDescriptor>../ejava/src/main/components/bin-samples.xml</componentDescriptor>
+ <componentDescriptor>../manager/src/main/components/bin-samples.xml</componentDescriptor>
+ <componentDescriptor>../process/src/main/components/bin-samples.xml</componentDescriptor>
+ <componentDescriptor>../web20/src/main/components/bin-samples.xml</componentDescriptor>
+ <componentDescriptor>../webservice/src/main/components/bin-samples.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
Modified: tuscany/java/sca/distribution/features/all/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/all/src/main/assembly/src.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/all/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/all/src/main/assembly/src.xml Mon Aug 25 08:55:15 2008
@@ -30,139 +30,13 @@
<format>zip</format>
</formats>
- <fileSets>
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>DISCLAIMER</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/src</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>BUILDING</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
-
- <!-- Add module sources to the modules directory -->
- <fileSet>
- <directory>../../../modules</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>assembly/**/*</include>
- <include>assembly-xml/**/*</include>
- <include>assembly-xsd/**/*</include>
- <include>binding-atom/**/*</include>
- <include>binding-atom-abdera/**/*</include>
- <include>binding-ejb/**/*</include>
- <include>binding-ejb-runtime/**/*</include>
- <include>binding-http/**/*</include>
- <include>binding-http-runtime/**/*</include>
- <include>binding-jms/**/*</include>
- <include>binding-jms-runtime/**/*</include>
- <include>binding-jsonrpc/**/*</include>
- <include>binding-jsonrpc-runtime/**/*</include>
- <include>binding-rss/**/*</include>
- <include>binding-rss-rome/**/*</include>
- <include>binding-sca/**/*</include>
- <include>binding-sca-axis2/**/*</include>
- <include>binding-sca-xml/**/*</include>
- <include>binding-ws/**/*</include>
- <include>binding-ws-axis2/**/*</include>
- <include>binding-ws-wsdlgen/**/*</include>
- <include>binding-ws-xml/**/*</include>
- <include>contribution/**/*</include>
- <include>contribution-impl/**/*</include>
- <include>contribution-java/**/*</include>
- <include>contribution-namespace/**/*</include>
- <include>contribution-resource/**/*</include>
- <include>contribution-xml/**/*</include>
- <include>core/**/*</include>
- <include>core-databinding/**/*</include>
- <include>core-spi/**/*</include>
- <include>data-api/**/*</include>
- <include>databinding/**/*</include>
- <include>databinding-axiom/**/*</include>
- <include>databinding-jaxb/**/*</include>
- <include>databinding-jaxb-axiom/**/*</include>
- <include>databinding-json/**/*</include>
- <include>databinding-saxon/**/*</include>
- <include>databinding-sdo/**/*</include>
- <include>definitions/**/*</include>
- <include>definitions-xml/**/*</include>
- <include>distribution-all/**/*</include>
- <include>distribution-core/**/*</include>
- <include>distribution-ejava/**/*</include>
- <include>distribution-manager/**/*</include>
- <include>distribution-process/**/*</include>
- <include>distribution-web20/**/*</include>
- <include>distribution-webservice/**/*</include>
- <include>domain-manager/**/*</include>
- <include>endpoint/**/*</include>
- <include>extensibility/**/*</include>
- <include>extension-helper/**/*</include>
- <include>host-ejb/**/*</include>
- <include>host-embedded/**/*</include>
- <include>host-http/**/*</include>
- <include>host-jetty/**/*</include>
- <include>implementation-bpel/**/*</include>
- <include>implementation-bpel-ode/**/*</include>
- <include>implementation-ejb/**/*</include>
- <include>implementation-java/**/*</include>
- <include>implementation-java-runtime/**/*</include>
- <include>implementation-java-xml/**/*</include>
- <include>implementation-node/**/*</include>
- <include>implementation-node-runtime/**/*</include>
- <include>implementation-resource/**/*</include>
- <include>implementation-resource-runtime/**/*</include>
- <include>implementation-script/**/*</include>
- <include>implementation-spring/**/*</include>
- <include>implementation-widget/**/*</include>
- <include>implementation-widget-runtime/**/*</include>
- <include>implementation-xquery/**/*</include>
- <include>interface/**/*</include>
- <include>interface-java/**/*</include>
- <include>interface-java-jaxws/**/*</include>
- <include>interface-java-xml/**/*</include>
- <include>interface-wsdl/**/*</include>
- <include>interface-wsdl-xml/**/*</include>
- <include>monitor/**/*</include>
- <include>monitor-logging/**/*</include>
- <include>node2-api/**/*</include>
- <include>node2-impl/**/*</include>
- <include>node2-launcher/**/*</include>
- <include>node-manager/**/*</include>
- <include>policy/**/*</include>
- <include>policy-security/**/*</include>
- <include>policy-security-ws/**/*</include>
- <include>policy-xml/**/*</include>
- <include>policy-xml-ws/**/*</include>
- <include>sca-api/**/*</include>
- <include>workspace/**/*</include>
- <include>workspace-impl/**/*</include>
- <include>workspace-xml/**/*</include>
- <include>xsd/**/*</include>
- <include>xsd-xml/**/*</include>
- </includes>
- <excludes>
- <!-- General file/folders to exclude -->
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/*.log</exclude>
-
- <!-- Specific files/folders to exclude -->
- <exclude>pom.xml</exclude>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/src-modules.xml</componentDescriptor>
+ <componentDescriptor>../ejava/src/main/components/src-modules.xml</componentDescriptor>
+ <componentDescriptor>../manager/src/main/components/src-modules.xml</componentDescriptor>
+ <componentDescriptor>../process/src/main/components/src-modules.xml</componentDescriptor>
+ <componentDescriptor>../web20/src/main/components/src-modules.xml</componentDescriptor>
+ <componentDescriptor>../webservice/src/main/components/src-modules.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
Modified: tuscany/java/sca/distribution/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/pom.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/pom.xml (original)
+++ tuscany/java/sca/distribution/features/core/pom.xml Mon Aug 25 08:55:15 2008
@@ -111,13 +111,6 @@
<version>1.4-SNAPSHOT</version>
</dependency>
- <!-- Hosts -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
<!-- Implementation types -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -150,20 +143,38 @@
<!-- Node runtime -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node2-api</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node2-impl</artifactId>
+ <artifactId>tuscany-node-launcher</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node2-launcher</artifactId>
+ <artifactId>tuscany-node-launcher-webapp</artifactId>
<version>1.4-SNAPSHOT</version>
+ <type>war</type>
</dependency>
+ <!-- Monitoring -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-monitor</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-monitor-logging</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
<!-- Policy models -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -240,9 +251,11 @@
<module>../../../modules/interface-wsdl</module>
<module>../../../modules/interface-wsdl-xml</module>
<module>../../../modules/monitor</module>
- <module>../../../modules/node2-api</module>
- <module>../../../modules/node2-impl</module>
- <module>../../../modules/node2-launcher</module>
+ <module>../../../modules/monitor-logging</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
<module>../../../modules/policy-xml</module>
Modified: tuscany/java/sca/distribution/features/core/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/assembly/bin.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/core/src/main/assembly/bin.xml Mon Aug 25 08:55:15 2008
@@ -30,88 +30,9 @@
<format>zip</format>
</formats>
- <fileSets>
-
- <!-- Add the text files to the top-level directroy -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>DISCLAIMER</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/bin</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
-
- <!-- Add the node launcher webapp to the modules directory -->
- <fileSet>
- <directory>../../sca/modules/node2-launcher-webapp/target</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>*.war</include>
- </includes>
- </fileSet>
-
- <!-- Add samples to the samples directory -->
- <fileSet>
- <directory>../../sca/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>calculator/**/*</include>
- <include>binding-echo/**/*</include>
- <include>binding-echo-extension/**/*</include>
- <include>databinding-echo/**/*</include>
- <include>implementation-composite/**/*</include>
- <include>implementation-crud/**/*</include>
- <include>implementation-crud-extension/**/*</include>
- <include>implementation-pojo-extension/**/*</include>
- <include>loanapplication/**/*</include>
- <include>simple-bigbank/**/*</include>
- <include>simple-callback/**/*</include>
- <include>supplychain/**/*</include>
- </includes>
- <excludes>
- <!-- General file/folders to exclude -->
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/*.log</exclude>
-
- <!-- Sample specific files/folders to exclude -->
- <exclude>pom.xml</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
-
- <!-- Add all the Tuscany modules to the modules directory -->
- <dependencySet>
- <outputDirectory>modules</outputDirectory>
- <unpack>false</unpack>
- <includes>
- <include>org.apache.tuscany.sca:*</include>
- </includes>
- </dependencySet>
-
- <!-- Add all the dependent jars to the lib directory -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <excludes>
- <exclude>org.apache.tuscany.sca:*</exclude>
- </excludes>
- </dependencySet>
-
- </dependencySets>
-
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/bin-dependencies.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
Modified: tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml Mon Aug 25 08:55:15 2008
@@ -30,88 +30,8 @@
<format>zip</format>
</formats>
- <fileSets>
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>DISCLAIMER</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/src</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>BUILDING</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
-
- <!-- Add module sources to the modules directory -->
- <fileSet>
- <directory>../../../modules</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>assembly/**/*</include>
- <include>assembly-xml/**/*</include>
- <include>assembly-xsd/**/*</include>
- <include>binding-sca/**/*</include>
- <include>binding-sca-xml/**/*</include>
- <include>contribution/**/*</include>
- <include>contribution-impl/**/*</include>
- <include>contribution-java/**/*</include>
- <include>contribution-namespace/**/*</include>
- <include>contribution-xml/**/*</include>
- <include>core/**/*</include>
- <include>core-databinding/**/*</include>
- <include>core-spi/**/*</include>
- <include>data-api/**/*</include>
- <include>databinding/**/*</include>
- <include>databinding-jaxb/**/*</include>
- <include>definitions/**/*</include>
- <include>definitions-xml/**/*</include>
- <include>endpoint/**/*</include>
- <include>extensibility/**/*</include>
- <include>host-embedded/**/*</include>
- <include>host-http/**/*</include>
- <include>implementation-java/**/*</include>
- <include>implementation-java-runtime/**/*</include>
- <include>implementation-java-xml/**/*</include>
- <include>implementation-node/**/*</include>
- <include>implementation-node-runtime/**/*</include>
- <include>interface/**/*</include>
- <include>interface-java/**/*</include>
- <include>interface-java-jaxws/**/*</include>
- <include>interface-java-xml/**/*</include>
- <include>interface-wsdl/**/*</include>
- <include>interface-wsdl-xml/**/*</include>
- <include>monitor/**/*</include>
- <include>node2-api/**/*</include>
- <include>node2-impl/**/*</include>
- <include>node2-launcher/**/*</include>
- <include>policy/**/*</include>
- <include>policy-security/**/*</include>
- <include>policy-xml/**/*</include>
- <include>sca-api/**/*</include>
- <include>xsd/**/*</include>
- <include>xsd-xml/**/*</include>
- </includes>
- <excludes>
- <!-- General file/folders to exclude -->
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/*.log</exclude>
-
- <!-- Specific files/folders to exclude -->
- <exclude>pom.xml</exclude>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/src-modules.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
Added: tuscany/java/sca/distribution/features/core/src/main/components/bin-common.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/bin-common.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/components/bin-common.xml (added)
+++ tuscany/java/sca/distribution/features/core/src/main/components/bin-common.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,44 @@
+<!--
+ * 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.
+-->
+<component>
+ <fileSets>
+
+ <!-- Add the text files to the top-level directroy -->
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>CHANGES</include>
+ <include>DISCLAIMER</include>
+ <include>README</include>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release/bin</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>INSTALL</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</component>
Added: tuscany/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml (added)
+++ tuscany/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,41 @@
+<!--
+ * 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.
+-->
+<component>
+ <dependencySets>
+
+ <!-- Add all the Tuscany modules to the modules directory -->
+ <dependencySet>
+ <outputDirectory>modules</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.apache.tuscany.sca:*</include>
+ </includes>
+ </dependencySet>
+
+ <!-- Add all the dependent jars to the lib directory -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <excludes>
+ <exclude>org.apache.tuscany.sca:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+
+</component>
Added: tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml (added)
+++ tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,103 @@
+<!--
+ * 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.
+-->
+<component>
+ <dependencySets>
+
+ <!-- Add all the Tuscany modules to the modules directory -->
+ <dependencySet>
+ <outputDirectory>modules</outputDirectory>
+ <unpack>false</unpack>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <includes>
+ <include>org.apache.tuscany.sca:*</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.tuscany.sca:tuscany-assembly</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-assembly-xml</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-assembly-xsd</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-binding-sca</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-binding-sca-xml</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-contribution</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-contribution-impl</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-contribution-java</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-contribution-namespace</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-contribution-xml</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-core</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-core-databinding</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-core-spi</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-data-api</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-databinding</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-databinding-jaxb</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-definitions</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-definitions-xml</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-endpoint</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-extensibility</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-host-embedded</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-host-http</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-implementation-java</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-implementation-java-runtime</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-implementation-java-xml</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-implementation-node</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-implementation-node-runtime</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-interface</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-interface-java</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-interface-java-jaxws</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-interface-java-xml</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-interface-wsdl</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-interface-wsdl-xml</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-monitor</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-monitor-logging</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-node-api</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-node-impl</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-node-launcher</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-node-launcher-webapp</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-policy</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-policy-security</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-policy-xml</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-sca-api</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-xsd</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-xsd-xml</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-distribution-core:pom</exclude>
+ </excludes>
+ </dependencySet>
+
+ <!-- Add all the dependent jars to the lib directory -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <excludes>
+ <exclude>asm:asm-all</exclude>
+ <exclude>cglib:cglib-nodep</exclude>
+ <exclude>com.sun.xml.bind:jaxb-impl</exclude>
+ <exclude>javax.activation:activation</exclude>
+ <exclude>javax.annotation:jsr250-api</exclude>
+ <exclude>javax.jws:jsr181-api</exclude>
+ <exclude>javax.xml.bind:jaxb-api</exclude>
+ <exclude>javax.xml.stream:stax-api</exclude>
+ <exclude>javax.xml.ws:jaxws-api</exclude>
+ <exclude>org.apache.geronimo.specs:geronimo-commonj_1.1_spec</exclude>
+ <exclude>org.apache.ws.commons.schema:XmlSchema</exclude>
+ <exclude>org.codehaus.woodstox:wstx-asl</exclude>
+ <exclude>wsdl4j:wsdl4j</exclude>
+ <exclude>org.apache.tuscany.sca:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</component>
Added: tuscany/java/sca/distribution/features/core/src/main/components/bin-samples.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/bin-samples.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/components/bin-samples.xml (added)
+++ tuscany/java/sca/distribution/features/core/src/main/components/bin-samples.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,54 @@
+<!--
+ * 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.
+-->
+<component>
+ <fileSets>
+
+ <!-- Add samples to the samples directory -->
+ <fileSet>
+ <directory>../../../samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>calculator/**/*</include>
+ <include>calculator-lean/**/*</include>
+ <include>binding-echo/**/*</include>
+ <include>binding-echo-extension/**/*</include>
+ <include>databinding-echo/**/*</include>
+ <include>implementation-composite/**/*</include>
+ <include>implementation-crud/**/*</include>
+ <include>implementation-crud-extension/**/*</include>
+ <include>implementation-pojo-extension/**/*</include>
+ <include>loanapplication/**/*</include>
+ <include>simple-bigbank/**/*</include>
+ <include>simple-callback/**/*</include>
+ <include>supplychain/**/*</include>
+ </includes>
+ <excludes>
+ <!-- General file/folders to exclude -->
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+ <exclude>**/*.log</exclude>
+
+ <!-- Sample specific files/folders to exclude -->
+ <exclude>pom.xml</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</component>
Added: tuscany/java/sca/distribution/features/core/src/main/components/src-common.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/src-common.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/components/src-common.xml (added)
+++ tuscany/java/sca/distribution/features/core/src/main/components/src-common.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,42 @@
+<!--
+ * 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.
+-->
+<component>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>CHANGES</include>
+ <include>DISCLAIMER</include>
+ <include>README</include>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release/src</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>BUILDING</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</component>
Copied: tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml (from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml?p2=tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml&p1=tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml&r1=688623&r2=688767&rev=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml Mon Aug 25 08:55:15 2008
@@ -1,55 +1,23 @@
-<?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
+ * 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
+ * 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 typically identifies the "type" (src vs bin etc) of the assembly -->
- <id>src</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory>
- <formats>
- <!--
- <format>dir</format>
- <format>tar.gz</format>
- -->
- <format>zip</format>
- </formats>
-
+<component>
<fileSets>
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>DISCLAIMER</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/src</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>BUILDING</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
<!-- Add module sources to the modules directory -->
<fileSet>
@@ -90,9 +58,11 @@
<include>interface-wsdl/**/*</include>
<include>interface-wsdl-xml/**/*</include>
<include>monitor/**/*</include>
- <include>node2-api/**/*</include>
- <include>node2-impl/**/*</include>
- <include>node2-launcher/**/*</include>
+ <include>monitor-logging/**/*</include>
+ <include>node-api/**/*</include>
+ <include>node-impl/**/*</include>
+ <include>node-launcher/**/*</include>
+ <include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
<include>policy-xml/**/*</include>
@@ -113,5 +83,4 @@
</excludes>
</fileSet>
</fileSets>
-
-</assembly>
+</component>
Modified: tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml Mon Aug 25 08:55:15 2008
@@ -30,79 +30,9 @@
<format>zip</format>
</formats>
- <fileSets>
-
- <!-- Add the text files to the top-level directroy -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>DISCLAIMER</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/bin</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
-
- <!-- Add the node launcher webapp to the modules directory -->
- <fileSet>
- <directory>../../sca/modules/node2-launcher-webapp/target</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>*.war</include>
- </includes>
- </fileSet>
-
- <!-- Add samples to the samples directory -->
- <fileSet>
- <directory>../../sca/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>helloworld-reference-jms/**/*</include>
- <include>helloworld-service-jms/**/*</include>
- <include>simple-bigbank-spring/**/*</include>
- </includes>
- <excludes>
- <!-- General file/folders to exclude -->
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/*.log</exclude>
-
- <!-- Sample specific files/folders to exclude -->
- <exclude>pom.xml</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
-
- <!-- Add all the Tuscany modules to the modules directory -->
- <dependencySet>
- <outputDirectory>modules</outputDirectory>
- <unpack>false</unpack>
- <includes>
- <include>org.apache.tuscany.sca:*</include>
- </includes>
- </dependencySet>
-
- <!-- Add all the dependent jars to the lib directory -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <excludes>
- <exclude>org.apache.tuscany.sca:*</exclude>
- </excludes>
- </dependencySet>
-
- </dependencySets>
-
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+ <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
Modified: tuscany/java/sca/distribution/features/ejava/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/src/main/assembly/src.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/ejava/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/ejava/src/main/assembly/src.xml Mon Aug 25 08:55:15 2008
@@ -30,100 +30,8 @@
<format>zip</format>
</formats>
- <fileSets>
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>DISCLAIMER</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/src</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>BUILDING</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
-
- <!-- Add module sources to the modules directory -->
- <fileSet>
- <directory>../../../modules</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>assembly/**/*</include>
- <include>assembly-xml/**/*</include>
- <include>assembly-xsd/**/*</include>
- <include>binding-ejb/**/*</include>
- <include>binding-ejb-runtime/**/*</include>
- <include>binding-jms/**/*</include>
- <include>binding-jms-runtime/**/*</include>
- <include>binding-sca/**/*</include>
- <include>binding-sca-xml/**/*</include>
- <include>contribution/**/*</include>
- <include>contribution-impl/**/*</include>
- <include>contribution-java/**/*</include>
- <include>contribution-namespace/**/*</include>
- <include>contribution-xml/**/*</include>
- <include>core/**/*</include>
- <include>core-databinding/**/*</include>
- <include>core-spi/**/*</include>
- <include>data-api/**/*</include>
- <include>databinding/**/*</include>
- <include>databinding-axiom/**/*</include>
- <include>databinding-jaxb/**/*</include>
- <include>definitions/**/*</include>
- <include>definitions-xml/**/*</include>
- <include>distribution-core/**/*</include>
- <include>distribution-ejava/**/*</include>
- <include>endpoint/**/*</include>
- <include>extensibility/**/*</include>
- <include>extension-helper/**/*</include>
- <include>host-ejb/**/*</include>
- <include>host-embedded/**/*</include>
- <include>host-http/**/*</include>
- <include>implementation-ejb/**/*</include>
- <include>implementation-java/**/*</include>
- <include>implementation-java-runtime/**/*</include>
- <include>implementation-java-xml/**/*</include>
- <include>implementation-node/**/*</include>
- <include>implementation-node-runtime/**/*</include>
- <include>implementation-script/**/*</include>
- <include>implementation-spring/**/*</include>
- <include>interface/**/*</include>
- <include>interface-java/**/*</include>
- <include>interface-java-jaxws/**/*</include>
- <include>interface-java-xml/**/*</include>
- <include>interface-wsdl/**/*</include>
- <include>interface-wsdl-xml/**/*</include>
- <include>monitor/**/*</include>
- <include>node2-api/**/*</include>
- <include>node2-impl/**/*</include>
- <include>node2-launcher/**/*</include>
- <include>policy/**/*</include>
- <include>policy-security/**/*</include>
- <include>policy-xml/**/*</include>
- <include>sca-api/**/*</include>
- <include>xsd/**/*</include>
- <include>xsd-xml/**/*</include>
- </includes>
- <excludes>
- <!-- General file/folders to exclude -->
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/*.log</exclude>
-
- <!-- Specific files/folders to exclude -->
- <exclude>pom.xml</exclude>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+ <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
Added: tuscany/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml (added)
+++ tuscany/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,44 @@
+<!--
+ * 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.
+-->
+<component>
+ <fileSets>
+
+ <!-- Add samples to the samples directory -->
+ <fileSet>
+ <directory>../../../samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>helloworld-reference-jms/**/*</include>
+ <include>helloworld-service-jms/**/*</include>
+ <include>simple-bigbank-spring/**/*</include>
+ </includes>
+ <excludes>
+ <!-- General file/folders to exclude -->
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+ <exclude>**/*.log</exclude>
+
+ <!-- Sample specific files/folders to exclude -->
+ <exclude>pom.xml</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</component>
Copied: tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml (from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml?p2=tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml&p1=tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml&r1=688623&r2=688767&rev=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml Mon Aug 25 08:55:15 2008
@@ -1,55 +1,23 @@
-<?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
+ * 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
+ * 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 typically identifies the "type" (src vs bin etc) of the assembly -->
- <id>src</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory>
- <formats>
- <!--
- <format>dir</format>
- <format>tar.gz</format>
- -->
- <format>zip</format>
- </formats>
-
+<component>
<fileSets>
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>DISCLAIMER</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/src</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>BUILDING</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
<!-- Add module sources to the modules directory -->
<fileSet>
@@ -90,9 +58,11 @@
<include>interface-wsdl/**/*</include>
<include>interface-wsdl-xml/**/*</include>
<include>monitor/**/*</include>
- <include>node2-api/**/*</include>
- <include>node2-impl/**/*</include>
- <include>node2-launcher/**/*</include>
+ <include>monitor-logging/**/*</include>
+ <include>node-api/**/*</include>
+ <include>node-impl/**/*</include>
+ <include>node-launcher/**/*</include>
+ <include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
<include>policy-xml/**/*</include>
@@ -113,5 +83,4 @@
</excludes>
</fileSet>
</fileSets>
-
-</assembly>
+</component>
Added: tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh (added)
+++ tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh Mon Aug 25 08:55:15 2008
@@ -0,0 +1,70 @@
+# 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.
+
+# This generates a Maven assembly component that can be included in a Maven
+# assembly to include the source of the modules in a source distribution.
+
+echo "<!--"
+echo " * Licensed to the Apache Software Foundation (ASF) under one"
+echo " * or more contributor license agreements. See the NOTICE file"
+echo " * distributed with this work for additional information"
+echo " * regarding copyright ownership. The ASF licenses this file"
+echo " * to you under the Apache License, Version 2.0 (the"
+echo " * "License"); you may not use this file except in compliance"
+echo " * with the License. You may obtain a copy of the License at"
+echo " *"
+echo " * http://www.apache.org/licenses/LICENSE-2.0"
+echo " *"
+echo " * Unless required by applicable law or agreed to in writing,"
+echo " * software distributed under the License is distributed on an"
+echo " * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
+echo " * KIND, either express or implied. See the License for the"
+echo " * specific language governing permissions and limitations"
+echo " * under the License."
+echo "-->"
+echo "<component>"
+echo " <dependencySets>"
+echo ""
+echo " <!-- Add all the Tuscany modules to the modules directory -->"
+echo " <dependencySet>"
+echo " <outputDirectory>modules</outputDirectory>"
+echo " <unpack>false</unpack>"
+echo " <useTransitiveFiltering>true</useTransitiveFiltering>"
+echo " <includes>"
+echo " <include>org.apache.tuscany.sca:*</include>"
+echo " </includes>"
+echo " <excludes>"
+mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf " <exclude>%s</exclude>\n", $1 }'
+echo " </excludes>"
+echo " </dependencySet>"
+echo ""
+echo " <!-- Add all the dependent jars to the lib directory -->"
+echo " <dependencySet>"
+echo " <outputDirectory>lib</outputDirectory>"
+echo " <unpack>false</unpack>"
+echo " <useTransitiveFiltering>true</useTransitiveFiltering>"
+echo " <excludes>"
+mvn -o dependency:list | awk '/.INFO. (.*):(.*):(.*):(.*):(.*)/ && !/(.*)(.tuscany.sca):(.*)/ { print gensub("(.INFO. )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf " <exclude>%s</exclude>\n", $1 }'
+echo " <exclude>org.apache.tuscany.sca:*</exclude>"
+echo " </excludes>"
+echo " </dependencySet>"
+echo " </dependencySets>"
+
+
+echo "</component>"
+echo ""
+
Propchange: tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh
------------------------------------------------------------------------------
svn:executable = *
Added: tuscany/java/sca/distribution/features/etc/generate-maven-files.sh
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/etc/generate-maven-files.sh?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/etc/generate-maven-files.sh (added)
+++ tuscany/java/sca/distribution/features/etc/generate-maven-files.sh Mon Aug 25 08:55:15 2008
@@ -0,0 +1,23 @@
+# 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.
+
+# This script can be used to generate Maven build POM and assembly files
+# for a distribution
+
+../etc/generate-src-modules.sh > src/main/components/src-modules.xml
+../etc/generate-pom.sh > pom.xml
+
Propchange: tuscany/java/sca/distribution/features/etc/generate-maven-files.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: tuscany/java/sca/distribution/features/etc/generate-pom.sh
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/etc/generate-pom.sh?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/etc/generate-pom.sh (original)
+++ tuscany/java/sca/distribution/features/etc/generate-pom.sh Mon Aug 25 08:55:15 2008
@@ -15,26 +15,20 @@
# specific language governing permissions and limitations
# under the License.
-# After building a distribution, this script can be used to
-# generate a Maven build profile that includes all the modules
-# included directly or transitively in that distribution
+# This script can be used to generate a Maven build profile that includes all
+# the modules included directly or transitively in a distribution
+
+cat pom.xml | awk 'BEGIN { i=0 } /<profiles>/ { i=1; print } /.*/ { if (i==0) print } '
echo " <profile>"
echo " <id>modules</id>"
echo " <modules>"
-unzip -v target/*-SNAPSHOT.zip | awk '/(.*)(\/modules\/tuscany-)(.*)(\..ar$)/ { print gensub("(.*)(/modules/tuscany-)(.*)(-...-SNAPSHOT.jar)", "\\3", "g")}' | sort | awk '{ printf " <module>../../../modules/%s</module>\n", $1 }'
+mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf " <module>../../../modules/%s</module>\n", $1 }'
echo " </modules>"
echo " </profile>"
echo ""
-# This generates a list of includes that can be included in a
-# Maven assembly fileset, to include the source of the modules
-# in a source distribution for example
-
-echo " <includes>"
-unzip -v target/*-SNAPSHOT.zip | awk '/(.*)(\/modules\/tuscany-)(.*)(\..ar$)/ { print gensub("(.*)(/modules/tuscany-)(.*)(-...-SNAPSHOT.jar)", "\\3", "g")}' | sort | awk '{ printf " <include>%s/**/*</include>\n", $1 }'
-echo " </includes>"
-echo ""
+cat pom.xml | awk 'BEGIN { i=0 } /<\/profiles>/ { i=1 } /.*/ { if (i==1) print } '
Added: tuscany/java/sca/distribution/features/etc/generate-src-modules.sh
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/etc/generate-src-modules.sh?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/etc/generate-src-modules.sh (added)
+++ tuscany/java/sca/distribution/features/etc/generate-src-modules.sh Mon Aug 25 08:55:15 2008
@@ -0,0 +1,66 @@
+# 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.
+
+# This generates a Maven assembly component that can be included in a Maven
+# assembly to include the source of the modules in a source distribution.
+
+echo "<!--"
+echo " * Licensed to the Apache Software Foundation (ASF) under one"
+echo " * or more contributor license agreements. See the NOTICE file"
+echo " * distributed with this work for additional information"
+echo " * regarding copyright ownership. The ASF licenses this file"
+echo " * to you under the Apache License, Version 2.0 (the"
+echo " * "License"); you may not use this file except in compliance"
+echo " * with the License. You may obtain a copy of the License at"
+echo " *"
+echo " * http://www.apache.org/licenses/LICENSE-2.0"
+echo " *"
+echo " * Unless required by applicable law or agreed to in writing,"
+echo " * software distributed under the License is distributed on an"
+echo " * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
+echo " * KIND, either express or implied. See the License for the"
+echo " * specific language governing permissions and limitations"
+echo " * under the License."
+echo "-->"
+echo "<component>"
+echo " <fileSets>"
+echo ""
+echo " <!-- Add module sources to the modules directory -->"
+echo " <fileSet>"
+echo " <directory>../../../modules</directory>"
+echo " <outputDirectory>modules</outputDirectory>"
+echo " <includes>"
+
+mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf " <include>%s/**/*</include>\n", $1 }'
+
+echo " </includes>"
+echo " <excludes>"
+echo " <!-- General file/folders to exclude -->"
+echo " <exclude>**/.*</exclude>"
+echo " <exclude>**/.*/**</exclude>"
+echo " <exclude>**/*.log</exclude>"
+echo ""
+echo " <!-- Specific files/folders to exclude -->"
+echo " <exclude>pom.xml</exclude>"
+echo " <exclude>**/target</exclude>"
+echo " <exclude>**/target/**/*</exclude>"
+echo " </excludes>"
+echo " </fileSet>"
+echo " </fileSets>"
+echo "</component>"
+echo ""
+
Propchange: tuscany/java/sca/distribution/features/etc/generate-src-modules.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: tuscany/java/sca/distribution/features/manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/pom.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/manager/pom.xml (original)
+++ tuscany/java/sca/distribution/features/manager/pom.xml Mon Aug 25 08:55:15 2008
@@ -31,13 +31,14 @@
<packaging>pom</packaging>
<dependencies>
-
+
<!-- Core distribution -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-core</artifactId>
<type>pom</type>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<!-- Binding Models -->
@@ -45,36 +46,43 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-atom</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ejb</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-http</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rss</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-sca-xml</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-xml</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<!-- Contribution models -->
@@ -82,16 +90,19 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-java</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-namespace</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-resource</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<!-- Domain support -->
@@ -99,11 +110,13 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-domain-manager</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-manager</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<!-- Implementation Models -->
@@ -111,31 +124,37 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-bpel</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-ejb</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-xml</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-node</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-resource</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-widget</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
Modified: tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml Mon Aug 25 08:55:15 2008
@@ -30,77 +30,9 @@
<format>zip</format>
</formats>
- <fileSets>
-
- <!-- Add the text files to the top-level directroy -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>CHANGES</include>
- <include>DISCLAIMER</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/bin</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
-
- <!-- Add the node launcher webapp to the modules directory -->
- <fileSet>
- <directory>../../sca/modules/node2-launcher-webapp/target</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>*.war</include>
- </includes>
- </fileSet>
-
- <!-- Add samples to the samples directory -->
- <fileSet>
- <directory>../../sca/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>domain-management/**/*</include>
- </includes>
- <excludes>
- <!-- General file/folders to exclude -->
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/*.log</exclude>
-
- <!-- Sample specific files/folders to exclude -->
- <exclude>pom.xml</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
-
- <!-- Add all the Tuscany modules to the modules directory -->
- <dependencySet>
- <outputDirectory>modules</outputDirectory>
- <unpack>false</unpack>
- <includes>
- <include>org.apache.tuscany.sca:*</include>
- </includes>
- </dependencySet>
-
- <!-- Add all the dependent jars to the lib directory -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <excludes>
- <exclude>org.apache.tuscany.sca:*</exclude>
- </excludes>
- </dependencySet>
-
- </dependencySets>
-
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+ <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>