diff options
| author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-24 11:38:05 +0000 |
|---|---|---|
| committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-24 11:38:05 +0000 |
| commit | 11e85829e1ccd585d7da79c50369b670cc37ed6f (patch) | |
| tree | 1e8de66d2ddef6a167bc905e3d6270f1c101c20f /branches/sca-java-1.4/distribution | |
| parent | 089a74e73dd5c1547b03c7f21bd03c5c9c5d8b86 (diff) | |
Fixes for RC3 review comments
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@729296 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
4 files changed, 11 insertions, 15 deletions
diff --git a/branches/sca-java-1.4/distribution/bundle/pom.xml b/branches/sca-java-1.4/distribution/bundle/pom.xml index 85ed27c757..6ea94debd3 100644 --- a/branches/sca-java-1.4/distribution/bundle/pom.xml +++ b/branches/sca-java-1.4/distribution/bundle/pom.xml @@ -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> diff --git a/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml b/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml index 1320412387..84a8ad07aa 100644 --- a/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml +++ b/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml @@ -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> diff --git a/branches/sca-java-1.4/distribution/src/main/assembly/src.xml b/branches/sca-java-1.4/distribution/src/main/assembly/src.xml index e57a876592..09cbf3a317 100644 --- a/branches/sca-java-1.4/distribution/src/main/assembly/src.xml +++ b/branches/sca-java-1.4/distribution/src/main/assembly/src.xml @@ -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> diff --git a/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE b/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE index a1eb109abe..8639d28561 100644 --- a/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE +++ b/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE @@ -278,13 +278,11 @@ The following components come under Apache Software License 2.0 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 |