Author: svkrish
Date: Tue Jul 24 05:49:35 2007
New Revision: 559030
URL: http://svn.apache.org/viewvc?view=rev&rev=559030
Log:
merging changes from 0.91 branch
Modified:
incubator/tuscany/java/sca/distribution/bundle/pom.xml
incubator/tuscany/java/sca/distribution/manifest/pom.xml
Modified: incubator/tuscany/java/sca/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/bundle/pom.xml?view=diff&rev=559030&r1=559029&r2=559030
==============================================================================
--- incubator/tuscany/java/sca/distribution/bundle/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/bundle/pom.xml Tue Jul 24 05:49:35
2007
@@ -54,6 +54,21 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-ajax</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-ejb</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-feed</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-jsonrpc</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -224,41 +239,44 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-policy</artifactId>
+ <artifactId>tuscany-implementation-spring</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>sca-api</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
-<!-- don't want the tools in the bundle jar?
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-wsdl2java</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-java2wsdl</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-maven-java2wsdl</artifactId>
+ <artifactId>tuscany-policy</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-maven-wsdl2java</artifactId>
+ <artifactId>sca-api</artifactId>
<version>${pom.version}</version>
</dependency>
--->
-
+ <!-- don't want the tools in the bundle jar?
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-wsdl2java</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-java2wsdl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-maven-java2wsdl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-maven-wsdl2java</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ -->
</dependencies>
- <build>
+ <build>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -268,39 +286,45 @@
</resource>
</resources>
- <plugins>
+ <plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>shade-maven-plugin</artifactId>
+ <version>1.0-alpha-7</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+
<shadedGroupFilter>org.apache.tuscany</shadedGroupFilter>
+
<shadedArtifactAttached>false</shadedArtifactAttached>
+
+ <artifactSet>
+ <excludes>
+
<exclude>org.apache.tuscany.sdo:tuscany-sdo-impl</exclude>
+ </excludes>
+ </artifactSet>
+
+ <transformers>
+ <transformer
implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+
<resource>META-INF/services/org.apache.tuscany.sca.core.ModuleActivator</resource>
+ </transformer>
+ <transformer
implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+
<resource>META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator</resource>
+ </transformer>
+ <transformer
implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+
<resource>META-INF/services/org.apache.tuscany.sca.spi.BindingActivator</resource>
+ </transformer>
+ </transformers>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shade-maven-plugin</artifactId>
- <version>1.0-alpha-7</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
-
<shadedGroupFilter>org.apache.tuscany</shadedGroupFilter>
-
<shadedArtifactAttached>false</shadedArtifactAttached>
-
- <artifactSet>
- <excludes>
-
<exclude>org.apache.tuscany.sdo:tuscany-sdo-impl</exclude>
- </excludes>
- </artifactSet>
-
- <transformers>
- <transformer
implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-
<resource>META-INF/services/org.apache.tuscany.sca.core.ModuleActivator</resource>
- </transformer>
- </transformers>
-
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/tuscany/java/sca/distribution/manifest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/manifest/pom.xml?view=diff&rev=559030&r1=559029&r2=559030
==============================================================================
--- incubator/tuscany/java/sca/distribution/manifest/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/manifest/pom.xml Tue Jul 24
05:49:35 2007
@@ -52,6 +52,21 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-ajax</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-ejb</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-feed</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-rmi</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -208,6 +223,11 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-implementation-script</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-spring</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
