diff options
| author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-18 06:45:00 +0000 |
|---|---|---|
| committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-18 06:45:00 +0000 |
| commit | d665745fd00bb07a1d03f9e4c430f49be72811a3 (patch) | |
| tree | 6f1b62f711b2bd797058c38e90c5306faef435aa /branches | |
| parent | eef22294a6c5036a9d1fb7145703dacc2f4c42e0 (diff) | |
Fixes for 1.4RC2 review
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@727658 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
3 files changed, 20 insertions, 5 deletions
diff --git a/branches/sca-java-1.4/distribution/bundle/pom.xml b/branches/sca-java-1.4/distribution/bundle/pom.xml index ffe18707a9..85ed27c757 100644 --- a/branches/sca-java-1.4/distribution/bundle/pom.xml +++ b/branches/sca-java-1.4/distribution/bundle/pom.xml @@ -132,12 +132,12 @@ <artifactId>tuscany-binding-sca-axis2</artifactId> <version>${pom.version}</version> </dependency> - <dependency> + <!-- dependency> <groupId>${pom.groupId}</groupId> <artifactId>tuscany-binding-sca-corba</artifactId> <version>${pom.version}</version> </dependency> - <!-- dependency> + <dependency> <groupId>${pom.groupId}</groupId> <artifactId>tuscany-binding-sca-jms</artifactId> <version>${pom.version}</version> 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 99b14b6f84..3bf4fb0797 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 @@ -259,6 +259,8 @@ <exclude>alert-aggregator-webapp/target/sdo-source/**/*</exclude> <exclude>alert-aggregator-webapp/target</exclude> <exclude>alert-aggregator-webapp/target/**/*</exclude> + <exclude>bigbank/target</exclude> + <exclude>bigbank/target/**/*</exclude> <exclude>bigbank/src/main/resources/web/dojo</exclude> <exclude>bigbank/src/main/resources/web/dojo/**/*</exclude> <exclude>bigbank-account/src/main/resources/web/dojo</exclude> @@ -327,6 +329,7 @@ <exclude>store/*/target/surefire-reports/**/*</exclude> <exclude>store/*/target/maven-archiver</exclude> <exclude>store/*/target/maven-archiver/**/*</exclude> + <exclude>store/catalog-webapp/target/tutorial-catalog-webapp.war</exclude> <exclude>store/catalog-webapp/target/war/</exclude> <exclude>store/catalog-webapp/target/war/**/*</exclude> <exclude>store/catalog-webapp/target/tutorial-catalog-webapp/</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 b15961d636..e57a876592 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 @@ -63,6 +63,8 @@ <exclude>contrib/**/*</exclude> <exclude>doc</exclude> <exclude>doc/**/*</exclude> + <exclude>etc</exclude> + <exclude>etc/**/*</exclude> <exclude>**/target</exclude> <exclude>**/target/**/*</exclude> <exclude>**/build</exclude> @@ -148,7 +150,7 @@ <exclude>modules/implementation-data</exclude> <exclude>modules/implementation-data/**/*</exclude> <exclude>modules/implementation-osgi/.felix</exclude> - <exclude>modules/implementation-osgi/.felix/**/*</exclude> + <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> @@ -157,8 +159,8 @@ <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/test/log</exclude> - <exclude>modules/implementation-openjpa/test/log/**/*</exclude> + <exclude>modules/implementation-openjpa</exclude> + <exclude>modules/implementation-openjpa/**/*</exclude> <exclude>samples/old</exclude> <exclude>samples/old/**/*</exclude> <exclude>samples/calculator-distributed/work</exclude> @@ -167,6 +169,16 @@ <exclude>samples/callback-ws-client/work/**/*</exclude> <exclude>samples/callback-ws-service/work</exclude> <exclude>samples/callback-ws-service/work/**/*</exclude> + <exclude>samples/calculator-corba-reference</exclude> + <exclude>samples/calculator-corba-reference/**/*</exclude> + <exclude>samples/calculator-corba-service</exclude> + <exclude>samples/calculator-corba-service/**/*</exclude> + <exclude>samples/customer-dojo</exclude> + <exclude>samples/customer-dojo/**/*</exclude> + <exclude>samples/customer-dojo-webapp</exclude> + <exclude>samples/customer-dojo-webapp/**/*</exclude> + <exclude>samples/loanapplication</exclude> + <exclude>samples/loanapplication/**/*</exclude> <exclude>samples/domain-webapp</exclude> <exclude>samples/domain-webapp/**/*</exclude> <exclude>samples/helloworld-jsonrpc-webapp/src/main/webapp/dojo</exclude> |