Fixes for TUSCANY-2716, 2717

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723636 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 73 insertions, 21 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>
diff --git a/branches/sca-java-1.4/samples/callbacks-jms/build.xml b/branches/sca-java-1.4/samples/callbacks-jms/build.xml
index 665feeca71..bc2c191fc2 100644
--- a/branches/sca-java-1.4/samples/callbacks-jms/build.xml
+++ b/branches/sca-java-1.4/samples/callbacks-jms/build.xml
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<project name="calculator" default="compile">

-    <property name="test.class" value="callbacks.CallbacksTestCase" />

+<project name="callbacks-jms" default="compile">

+    <property name="test.class" value="callbacks.CallbackJMSClient" />

 	<property name="test.jar"   value="sample-callbacks-jms.jar" />

 	

     <target name="init">

diff --git a/branches/sca-java-1.4/samples/callbacks-jms/pom.xml b/branches/sca-java-1.4/samples/callbacks-jms/pom.xml
index 25f3f5592e..9a96fa6078 100644
--- a/branches/sca-java-1.4/samples/callbacks-jms/pom.xml
+++ b/branches/sca-java-1.4/samples/callbacks-jms/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-callbacks-jms</artifactId>
-    <name>Apache Tuscany SCA Callbacks with JMS Sample</name>
+    <name>Apache Tuscany SCA Sample Callbacks with JMS</name>
 
     <repositories>
        <repository>
diff --git a/branches/sca-java-1.4/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java b/branches/sca-java-1.4/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java
new file mode 100644
index 0000000000..a08d336180
--- /dev/null
+++ b/branches/sca-java-1.4/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java
@@ -0,0 +1,26 @@
+package callbacks;

+

+import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+

+public class CallbackJMSClient {

+	

+	public static void main(String[] args) throws Exception {

+

+        SCANodeFactory factory = SCANodeFactory.newInstance();

+        SCANode node = factory.createSCANodeFromClassLoader("callbacks.composite", CallbackJMSClient.class.getClassLoader());

+        node.start();

+        

+        OrderServiceClient orderServiceClient = ((SCAClient)node).getService(OrderServiceClient.class, "ClientComponent");

+        

+        // do something

+        orderServiceClient.doSomeOrdering();

+        

+        // wait to give the service time to respond

+        Thread.sleep(500);

+        

+        node.stop();

+    }

+

+}

diff --git a/branches/sca-java-1.4/tutorials/store/README b/branches/sca-java-1.4/tutorials/store/README
index c90604b1a5..3bf9db22f2 100644
--- a/branches/sca-java-1.4/tutorials/store/README
+++ b/branches/sca-java-1.4/tutorials/store/README
@@ -16,7 +16,7 @@ Running The Tutorial Application
 
 Start the SCA Domain Manager:
    cd domain
-   java -jar ../../modules/tuscany-node-launcher-1.4.jar domain
+   java -jar ../../../modules/tuscany-node-launcher-1.4.jar domain
 
 To access the SCA Manager application, point your Web browser to:
    http://localhost:9990/ui/cloud/