You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ra...@apache.org on 2008/12/24 12:38:06 UTC
svn commit: r729296 - in /tuscany/branches/sca-java-1.4/distribution:
bundle/pom.xml src/main/assembly/bin.xml src/main/assembly/src.xml
src/main/release/bin/LICENSE
Author: ramkumar
Date: Wed Dec 24 03:38:05 2008
New Revision: 729296
URL: http://svn.apache.org/viewvc?rev=729296&view=rev
Log:
Fixes for RC3 review comments
Modified:
tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml
tuscany/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml
tuscany/branches/sca-java-1.4/distribution/src/main/assembly/src.xml
tuscany/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE
Modified: tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml?rev=729296&r1=729295&r2=729296&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml (original)
+++ tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml Wed Dec 24 03:38:05 2008
@@ -177,6 +177,10 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
<!-- <exclusion>
<groupId>opensaml</groupId>
<artifactId>opensaml</artifactId>
@@ -525,18 +529,20 @@
<artifactId>tuscany-tracing-aspectj</artifactId>
<version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-wsdl2java</artifactId>
<version>${pom.version}</version>
<exclusions>
-
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-activation_1.1_spec</artifactId>
</exclusion>
-
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: tuscany/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml?rev=729296&r1=729295&r2=729296&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml (original)
+++ tuscany/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml Wed Dec 24 03:38:05 2008
@@ -125,6 +125,8 @@
<exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp</exclude>
<exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp/**/*</exclude>
<exclude>helloworld-dojo-webapp/target/war</exclude>
+ <exclude>helloworld-jms-webapp/target/sample-helloworld-jms-webapp</exclude>
+ <exclude>helloworld-jms-webapp/target/sample-helloworld-jms-webapp/**/*</exclude>
<exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp</exclude>
<exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp/**/*</exclude>
<exclude>helloworld-ws-reference/work</exclude>
Modified: tuscany/branches/sca-java-1.4/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/distribution/src/main/assembly/src.xml?rev=729296&r1=729295&r2=729296&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/distribution/src/main/assembly/src.xml (original)
+++ tuscany/branches/sca-java-1.4/distribution/src/main/assembly/src.xml Wed Dec 24 03:38:05 2008
@@ -153,12 +153,6 @@
<exclude>modules/implementation-osgi/.felix/**/*</exclude>
<exclude>modules/osgi-runtime/.felix</exclude>
<exclude>modules/osgi-runtime/.felix/**/*</exclude>
- <exclude>modules/core-spi/src/main/java/org/apache/tuscany/sca/work</exclude>
- <exclude>modules/core-spi/src/main/java/org/apache/tuscany/sca/work/**/*</exclude>
- <exclude>modules/core/src/main/java/org/apache/tuscany/sca/core/work</exclude>
- <exclude>modules/core/src/main/java/org/apache/tuscany/sca/core/work/**/*</exclude>
- <exclude>modules/core/src/test/java/org/apache/tuscany/sca/core/work</exclude>
- <exclude>modules/core/src/test/java/org/apache/tuscany/sca/core/work/**/*</exclude>
<exclude>modules/implementation-openjpa</exclude>
<exclude>modules/implementation-openjpa/**/*</exclude>
<exclude>samples/old</exclude>
@@ -229,10 +223,6 @@
<exclude>demos/bigbank-account/src/main/resources/web/dojo/**/*</exclude>
<exclude>demos/secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo</exclude>
<exclude>demos/secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo/**/*</exclude>
- <exclude>tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log</exclude>
- <exclude>tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/**/*</exclude>
- <exclude>tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log</exclude>
- <exclude>tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/**/*</exclude>
<exclude>*/**/derby.log</exclude>
<exclude>*/**/*.svg</exclude>
<exclude>*/**/*.ruleset</exclude>
Modified: tuscany/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE?rev=729296&r1=729295&r2=729296&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE (original)
+++ tuscany/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE Wed Dec 24 03:38:05 2008
@@ -278,13 +278,11 @@
geronimo-security-1.2-beta.jar
geronimo-spec-j2ee-connector-1.5-rc4.jar
geronimo-spec-jta-1.0.1B-rc4.jar
- geronimo-stax-api_1.0_spec-1.0.1.jar
geronimo-system-1.2-beta.jar
geronimo-transaction-1.2-beta.jar
geronimo-util-1.2-beta.jar
httpcore-4.0-beta1.jar
httpcore-nio-4.0-beta1.jar
- jakarta-regexp-1.4.jar
jettison-1.0.1.jar
jetty-6.1.7.jar
jetty-util-6.1.7.jar