diff options
-rw-r--r-- | java/sca/distribution/all/pom.xml | 53 | ||||
-rw-r--r-- | java/sca/distribution/core/src/main/components/bin-modules.xml | 2 | ||||
-rw-r--r-- | java/sca/distribution/pdetarget/pom.xml | 2 | ||||
-rw-r--r-- | java/sca/distribution/webservice/pom.xml | 119 | ||||
-rw-r--r-- | java/sca/distribution/webservice/src/main/components/src-modules.xml | 14 |
5 files changed, 85 insertions, 105 deletions
diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml index 5a3ed1d5fa..9b94c531d9 100644 --- a/java/sca/distribution/all/pom.xml +++ b/java/sca/distribution/all/pom.xml @@ -34,13 +34,13 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-api</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-api</artifactId> + <type>pom</type> + <version>2.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-distribution-core</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
@@ -48,21 +48,21 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-webapp</artifactId>
+ <artifactId>tuscany-distribution-webapp</artifactId> <type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-webservice</artifactId>
+ <artifactId>tuscany-distribution-webservice</artifactId> <type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-ejava</artifactId>
+ <artifactId>tuscany-distribution-ejava</artifactId> <type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -72,30 +72,30 @@ <artifactId>tuscany-launcher</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <!--
+ <!-- <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-manager</artifactId>
+ <artifactId>tuscany-distribution-manager</artifactId> <type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-process</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-web20</artifactId>
+ <artifactId>tuscany-distribution-process</artifactId> <type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-web20</artifactId> + <type>pom</type> + <version>2.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-gdata-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -117,8 +117,8 @@ <artifactId>tuscany-tracing-aspectj</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- -->
-
+ --> + </dependencies>
<profiles>
@@ -126,9 +126,9 @@ <!-- Build profile that can be used to build the distro packages -->
<profile>
<id>distribution</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+ <activation> + <activeByDefault>true</activeByDefault> + </activation> <build>
<plugins>
<plugin>
@@ -143,7 +143,8 @@ </goals>
<configuration>
<targetDirectory>target/modules</targetDirectory>
- <generateManifestJar>true</generateManifestJar>
+ <useDistributionName>false</useDistributionName> + <generateManifestJar>true</generateManifestJar> </configuration>
</execution>
</executions>
diff --git a/java/sca/distribution/core/src/main/components/bin-modules.xml b/java/sca/distribution/core/src/main/components/bin-modules.xml index 05b3d3a85d..69ec47740a 100644 --- a/java/sca/distribution/core/src/main/components/bin-modules.xml +++ b/java/sca/distribution/core/src/main/components/bin-modules.xml @@ -24,7 +24,7 @@ <outputDirectory>/</outputDirectory>
<includes>
<include>modules/**/*</include>
- <include>tuscany-distribution-*/**/*</include>
+ <include>features/**/*</include>
</includes>
</fileSet>
diff --git a/java/sca/distribution/pdetarget/pom.xml b/java/sca/distribution/pdetarget/pom.xml index b978a50ca3..b607984260 100644 --- a/java/sca/distribution/pdetarget/pom.xml +++ b/java/sca/distribution/pdetarget/pom.xml @@ -81,6 +81,8 @@ <targetDirectory>target/modules</targetDirectory>
<generateTargetPlatform>true</generateTargetPlatform>
<generateConfig>true</generateConfig>
+ <generateManifestJar>false</generateManifestJar>
+ <useDistributionName>false</useDistributionName>
<useDefaultLocation>true</useDefaultLocation>
<excludeGroupIds>
<excludeGroupId>org.apache.tuscany.sca</excludeGroupId>
diff --git a/java/sca/distribution/webservice/pom.xml b/java/sca/distribution/webservice/pom.xml index 807d94f94c..4a78c2c3cf 100644 --- a/java/sca/distribution/webservice/pom.xml +++ b/java/sca/distribution/webservice/pom.xml @@ -191,71 +191,60 @@ <profile> <id>modules</id> <modules> - <module>../../../modules/assembly</module> - <module>../../../modules/assembly-xml</module> - <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-axis2</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/binding-ws</module> - <module>../../../modules/binding-ws-axis2</module> - <module>../../../modules/binding-ws-axis2-policy</module> - <module>../../../modules/binding-ws-wsdlgen</module> - <module>../../../modules/binding-ws-xml</module> - <module>../../../modules/contribution</module> - <module>../../../modules/contribution-java</module> - <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-xml</module> - <module>../../../modules/core</module> - <module>../../../modules/core-databinding</module> - <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> - <module>../../../modules/databinding</module> - <module>../../../modules/databinding-axiom</module> - <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/databinding-jaxb-axiom</module> - <module>../../../modules/databinding-sdo</module> - <module>../../../modules/databinding-sdo-axiom</module> - <module>../../../modules/definitions</module> - <module>../../../modules/definitions-xml</module> - <module>../../../modules/endpoint</module> - <module>../../../modules/extensibility</module> - <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/host-corba</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-http</module> - <module>../../../modules/host-jetty</module> - <module>../../../modules/implementation-java</module> - <module>../../../modules/implementation-java-runtime</module> - <module>../../../modules/implementation-java-xml</module> - <module>../../../modules/implementation-node</module> - <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/interface</module> - <module>../../../modules/interface-java</module> - <module>../../../modules/interface-java-jaxws</module> - <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> - <module>../../../modules/monitor</module> - <module>../../../modules/node-api</module> - <module>../../../modules/node-impl</module> - <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-security-jsr250</module> - <module>../../../modules/policy-security-ws</module> - <module>../../../modules/policy-xml</module> - <module>../../../modules/policy-xml-ws</module> - <module>../../../modules/sca-api</module> - <module>../../../modules/workspace</module> - <module>../../../modules/workspace-impl</module> - <module>../../../modules/workspace-xml</module> - <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> + <module>../../modules/assembly</module> + <module>../../modules/assembly-xml</module> + <module>../../modules/assembly-xsd</module> + <module>../../modules/binding-sca</module> + <module>../../modules/binding-sca-xml</module> + <module>../../modules/binding-ws</module> + <module>../../modules/binding-ws-axis2</module> + <module>../../modules/binding-ws-axis2-policy</module> + <module>../../modules/binding-ws-wsdlgen</module> + <module>../../modules/binding-ws-xml</module> + <module>../../modules/contribution</module> + <module>../../modules/contribution-java</module> + <module>../../modules/contribution-namespace</module> + <module>../../modules/contribution-xml</module> + <module>../../modules/core</module> + <module>../../modules/core-databinding</module> + <module>../../modules/core-spi</module> + <module>../../modules/databinding</module> + <module>../../modules/databinding-axiom</module> + <module>../../modules/databinding-jaxb</module> + <module>../../modules/databinding-jaxb-axiom</module> + <module>../../modules/definitions</module> + <module>../../modules/definitions-xml</module> + <module>../../modules/endpoint</module> + <module>../../modules/extensibility</module> + <module>../../modules/extensibility-equinox</module> + <module>../../modules/host-http</module> + <module>../../modules/host-jetty</module> + <module>../../modules/implementation-java</module> + <module>../../modules/implementation-java-runtime</module> + <module>../../modules/implementation-java-xml</module> + <module>../../modules/implementation-node</module> + <module>../../modules/implementation-node-runtime</module> + <module>../../modules/interface</module> + <module>../../modules/interface-java</module> + <module>../../modules/interface-java-jaxws</module> + <module>../../modules/interface-java-xml</module> + <module>../../modules/interface-wsdl</module> + <module>../../modules/interface-wsdl-xml</module> + <module>../../modules/monitor</module> + <module>../../modules/node-api</module> + <module>../../modules/node-impl</module> + <module>../../modules/node-launcher</module> + <module>../../modules/node-launcher-equinox</module> + <module>../../modules/policy</module> + <module>../../modules/policy-security</module> + <module>../../modules/policy-xml</module> + <module>../../modules/policy-xml-ws</module> + <module>../../modules/sca-api</module> + <module>../../modules/workspace</module> + <module>../../modules/workspace-impl</module> + <module>../../modules/workspace-xml</module> + <module>../../modules/xsd</module> + <module>../../modules/xsd-xml</module> </modules> </profile> </profiles> diff --git a/java/sca/distribution/webservice/src/main/components/src-modules.xml b/java/sca/distribution/webservice/src/main/components/src-modules.xml index d4c14d2d90..deea9b713c 100644 --- a/java/sca/distribution/webservice/src/main/components/src-modules.xml +++ b/java/sca/distribution/webservice/src/main/components/src-modules.xml @@ -21,16 +21,13 @@ <!-- Add module sources to the modules directory --> <fileSet> - <directory>../../../modules</directory> + <directory>../../modules</directory> <outputDirectory>modules</outputDirectory> <includes> <include>assembly/**/*</include> <include>assembly-xml/**/*</include> <include>assembly-xsd/**/*</include> - <include>binding-corba/**/*</include> - <include>binding-corba-runtime/**/*</include> <include>binding-sca/**/*</include> - <include>binding-sca-axis2/**/*</include> <include>binding-sca-xml/**/*</include> <include>binding-ws/**/*</include> <include>binding-ws-axis2/**/*</include> @@ -38,28 +35,22 @@ <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-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-sdo/**/*</include> - <include>databinding-sdo-axiom/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> <include>distribution-core/**/*</include> <include>endpoint/**/*</include> <include>extensibility/**/*</include> <include>extensibility-equinox/**/*</include> - <include>host-corba/**/*</include> - <include>host-corba-jse/**/*</include> <include>host-http/**/*</include> <include>host-jetty/**/*</include> <include>implementation-java/**/*</include> @@ -78,11 +69,8 @@ <include>node-impl/**/*</include> <include>node-launcher/**/*</include> <include>node-launcher-equinox/**/*</include> - <include>node-launcher-webapp/**/*</include> <include>policy/**/*</include> <include>policy-security/**/*</include> - <include>policy-security-jsr250/**/*</include> - <include>policy-security-ws/**/*</include> <include>policy-xml/**/*</include> <include>policy-xml-ws/**/*</include> <include>sca-api/**/*</include> |