diff options
Diffstat (limited to 'branches/sca-java-1.4/distribution')
3 files changed, 43 insertions, 17 deletions
diff --git a/branches/sca-java-1.4/distribution/bundle/pom.xml b/branches/sca-java-1.4/distribution/bundle/pom.xml index 0ef61b6c87..1221266c4b 100644 --- a/branches/sca-java-1.4/distribution/bundle/pom.xml +++ b/branches/sca-java-1.4/distribution/bundle/pom.xml @@ -177,10 +177,10 @@ <groupId>bouncycastle</groupId> <artifactId>bcprov-jdk15</artifactId> </exclusion> - <exclusion> + <!-- <exclusion> <groupId>opensaml</groupId> <artifactId>opensaml</artifactId> - </exclusion> + </exclusion> --> </exclusions> </dependency> <dependency> @@ -230,11 +230,6 @@ </dependency> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-contribution-groovy</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> <artifactId>tuscany-core</artifactId> <version>${pom.version}</version> </dependency> @@ -390,11 +385,6 @@ </dependency> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-node</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> <artifactId>tuscany-implementation-node-runtime</artifactId> <version>${pom.version}</version> <exclusions> @@ -692,6 +682,9 @@ <resource>META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint</resource> </transformer> <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer"> + <resource>META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint</resource> + </transformer> + <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer"> <resource>META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator</resource> </transformer> <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer"> @@ -710,6 +703,9 @@ <resource>META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory</resource> </transformer> <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer"> + <resource>META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory</resource> + </transformer> + <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer"> <resource>META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory</resource> </transformer> <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer"> 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 7d93996640..77ae894dc8 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 @@ -150,9 +150,13 @@ <exclude>osgi-supplychain/.felix</exclude> <exclude>osgi-supplychain/.felix/**/*</exclude> <exclude>osgi-supplychain/target/sample-osgi-supplychain</exclude> - <exclude>osgi-supplychain/target/sample-osgi-supplychain/**/*</exclude> + <exclude>osgi-supplychain/target/sample-osgi-supplychain/**/*</exclude> + <exclude>simple-bigbank-spring/work</exclude> + <exclude>simple-bigbank-spring/work/**/*</exclude> <exclude>simple-bigbank-spring/src/main/resources/web/dojo</exclude> <exclude>simple-bigbank-spring/src/main/resources/web/dojo/**/*</exclude> + <exclude>spring-bigbank-stockquote/work</exclude> + <exclude>spring-bigbank-stockquote/work/**/*</exclude> <exclude>simple-callback-ws/work</exclude> <exclude>simple-callback-ws/work/**/*</exclude> <exclude>zipcode-jaxws/target/endorsed</exclude> @@ -331,8 +335,10 @@ <exclude>store/*/target/surefire-reports/**/*</exclude> <exclude>store/*/target/maven-archiver</exclude> <exclude>store/*/target/maven-archiver/**/*</exclude> - <exclude>store/catalog-webapp/target</exclude> - <exclude>store/catalog-webapp/target/**/*</exclude> + <exclude>store/catalog-webapp/target/war/</exclude> + <exclude>store/catalog-webapp/target/war/**/*</exclude> + <exclude>store/catalog-webapp/target/tutorial-catalog-webapp/</exclude> + <exclude>store/catalog-webapp/target/tutorial-catalog-webapp/**/*</exclude> <exclude>store/store-db/target/cart-db/</exclude> <exclude>store/store-db/target/cart-db/**/*</exclude> <exclude>store/store-eu/target/cart-eu-db/</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 fc0030a2cc..ce98738923 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 @@ -98,7 +98,7 @@ <exclude>itest/contribution-import-export/import-wsdl/work/**/*</exclude> <exclude>itest/conversations-ws/work</exclude> <exclude>itest/conversations-ws/work/**/*</exclude> - <exclude>itest/databindings/jaxbgen/velocity.log</exclude> + <exclude>itest/databindings/jaxbgen/velocity.log</exclude> <exclude>itest/domain/work</exclude> <exclude>itest/domain/work/**/*</exclude> <exclude>itest/exceptions-simple-ws/work</exclude> @@ -109,6 +109,14 @@ <exclude>itest/policy/work/**/*</exclude> <exclude>itest/transaction/derbydb</exclude> <exclude>itest/transaction/derbydb/**/*</exclude> + <exclude>itest/late-reference-resolution/work</exclude> + <exclude>itest/late-reference-resolution/work/**/*</exclude> + <exclude>itest/policy-security-basicauth/work</exclude> + <exclude>itest/policy-security-basicauth/work/**/*</exclude> + <exclude>itest/policy-security-token/work</exclude> + <exclude>itest/policy-security-token/work/**/*</exclude> + <exclude>itest/spring/work</exclude> + <exclude>itest/spring/work/**/*</exclude> <exclude>itest/ws-void-args-return/work</exclude> <exclude>itest/ws-void-args-return/work/**/*</exclude> <exclude>vtest/wsbinding/nowsdl/defaultbinding/work</exclude> @@ -121,6 +129,12 @@ <exclude>vtest/wsbinding/nowsdl/soapversion/work/**/*</exclude> <exclude>vtest/wsbinding/service/work</exclude> <exclude>vtest/wsbinding/service/work/**/*</exclude> + <exclude>vtest/wsbinding/wsdlelement/binding/work</exclude> + <exclude>vtest/wsbinding/wsdlelement/binding/work/**/*</exclude> + <exclude>vtest/wsbinding/wsdlelement/port/work</exclude> + <exclude>vtest/wsbinding/wsdlelement/port/work/**/*</exclude> + <exclude>vtest/wsbinding/wsdlelement/service/work</exclude> + <exclude>vtest/wsbinding/wsdlelement/service/work/**/*</exclude> <exclude>modules/domain-impl/work</exclude> <exclude>modules/domain-impl/work/**/*</exclude> <exclude>modules/host-tomcat/work</exclude> @@ -136,6 +150,12 @@ <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>samples/old</exclude> <exclude>samples/old/**/*</exclude> <exclude>samples/calculator-distributed/work</exclude> @@ -179,7 +199,11 @@ <exclude>samples/simple-callback-ws/work</exclude> <exclude>samples/simple-callback-ws/work/**/*</exclude> <exclude>samples/simple-bigbank-spring/src/main/resources/web/dojo</exclude> - <exclude>samples/simple-bigbank-spring/src/main/resources/web/dojo/**/*</exclude> + <exclude>samples/simple-bigbank-spring/src/main/resources/web/dojo/**/*</exclude> + <exclude>samples/simple-bigbank-spring/work</exclude> + <exclude>samples/simple-bigbank-spring/work/**/*</exclude> + <exclude>samples/spring-bigbank-stockquote/work</exclude> + <exclude>samples/spring-bigbank-stockquote/work/**/*</exclude> <exclude>demos/alert-aggregator-webapp/bin</exclude> <exclude>demos/alert-aggregator-webapp/bin/**/*</exclude> <exclude>demos/alert-aggregator-webapp/src/main/webapp/dojo</exclude> |