diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-03 21:59:43 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-03 21:59:43 +0000 |
| commit | 60b20572d5b6a74dcb34e5a18cf36175557b576d (patch) | |
| tree | c43cd590cb0054471f9514804ae2f21469319e10 /java/sca/distribution/all | |
| parent | 2bdf184f687417666c0592fbfd2f14d2d24e1ca0 (diff) | |
Update the distribution to use the features
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@740471 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/distribution/all')
| -rw-r--r-- | java/sca/distribution/all/pom.xml | 112 | ||||
| -rw-r--r-- | java/sca/distribution/all/src/main/assembly/bin.xml | 2 |
2 files changed, 3 insertions, 111 deletions
diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml index 420757168d..6ffbdc080f 100644 --- a/java/sca/distribution/all/pom.xml +++ b/java/sca/distribution/all/pom.xml @@ -34,91 +34,10 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-api</artifactId>
+ <artifactId>tuscany-feature-all</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>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <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>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-ejava</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-launcher</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <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>
- <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>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-fastinfoset</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-xmlbeans</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-tracing-aspectj</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- -->
-
</dependencies>
<build>
@@ -146,33 +65,6 @@ <profiles>
- <!-- Build profile that can be used to build and eclipse project to make -->
- <!-- it easy to import the pde target into the workspace -->
- <!--profile>
- <id>eclipse</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-bundle-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>generate-pde</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>eclipse</goal>
- </goals>
- <configuration>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile-->
-
<!-- Build profile that can be used to build the distro packages -->
<profile>
<id>distribution</id>
@@ -194,7 +86,7 @@ <configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
- <!-- TUSCANY-2814 descriptor>src/main/assembly/src.xml</descriptor -->
+ <descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-all-2.0-SNAPSHOT</finalName>
diff --git a/java/sca/distribution/all/src/main/assembly/bin.xml b/java/sca/distribution/all/src/main/assembly/bin.xml index 25569dc40c..1323608a70 100644 --- a/java/sca/distribution/all/src/main/assembly/bin.xml +++ b/java/sca/distribution/all/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
<componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
<componentDescriptor>../ejava/src/main/components/bin-samples.xml</componentDescriptor>
- <componentDescriptor>../host-webapp/src/main/components/bin-samples.xml</componentDescriptor>
+ <componentDescriptor>../webapp/src/main/components/bin-samples.xml</componentDescriptor>
<componentDescriptor>../webservice/src/main/components/bin-samples.xml</componentDescriptor>
<componentDescriptor>../all/src/main/components/bin-launcher.xml</componentDescriptor>
|