Fix build errors and remove SNAPSHOT dependencies

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

5 files changed, 110 insertions, 108 deletions

diff --git a/sandbox/travelsample/chapter-05/node/build.xml b/sandbox/travelsample/chapter-05/node/build.xml
index a70be4e664..773598a32f 100644
--- a/sandbox/travelsample/chapter-05/node/build.xml
+++ b/sandbox/travelsample/chapter-05/node/build.xml
@@ -18,6 +18,7 @@
 -->
 
 <project name="scatours-chapter-05-node" default="compile">
+    <property environment="env"/> 
 
     <target name="compile">
         <mkdir dir="target/classes"/>
@@ -33,7 +34,7 @@
         </copy>
         <jar destfile="target/scatours-chapter-05-node.jar" basedir="target/classes">
             <manifest>
-                <attribute name="Main-Class" value="launch.LaunchTutorialAdmin"/>
+                <attribute name="Main-Class" value="scatours.LaunchNode"/>
             </manifest>
         </jar>
     </target>
@@ -41,7 +42,7 @@
     <target name="package" depends="compile"/>
 
     <target name="run">
-        <java classname="launch.LaunchTutorialAdmin" fork="true">
+        <java classname="scatours.LaunchNode" fork="true">
             <classpath>
                 <pathelement location="target/scatours-chapter-05-node.jar"/>
                 <fileset refid="tuscany.jars"/>
@@ -56,86 +57,86 @@
         </delete>
     </target>
 
-    <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-atom-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-atom-abdera-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ejb-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ejb-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-axis2-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-policy-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-wsdlgen-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-resource-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-data-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-axiom-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-axiom-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-json-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-sdo-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-manager-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-endpoint-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-host-http-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-host-jetty-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-bpel-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-bpel-ode-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-ejb-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-widget-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-widget-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-wsdl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-wsdl-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-launcher-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-manager-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-security-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-ws-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-xml-1.5-SNAPSHOT.jar"/>
+    <fileset id="tuscany.jars" dir="${env.TUSCANY}/modules">
+        <include name="tuscany-assembly-1.4.jar"/>
+        <include name="tuscany-assembly-xml-1.4.jar"/>
+        <include name="tuscany-assembly-xsd-1.4.jar"/>
+        <include name="tuscany-binding-atom-1.4.jar"/>
+        <include name="tuscany-binding-atom-abdera-1.4.jar"/>
+        <include name="tuscany-binding-ejb-1.4.jar"/>
+        <include name="tuscany-binding-ejb-runtime-1.4.jar"/>
+        <include name="tuscany-binding-http-1.4.jar"/>
+        <include name="tuscany-binding-http-runtime-1.4.jar"/>
+        <include name="tuscany-binding-jsonrpc-1.4.jar"/>
+        <include name="tuscany-binding-jsonrpc-runtime-1.4.jar"/>
+        <include name="tuscany-binding-sca-1.4.jar"/>
+        <include name="tuscany-binding-sca-axis2-1.4.jar"/>
+        <include name="tuscany-binding-sca-xml-1.4.jar"/>
+        <include name="tuscany-binding-ws-1.4.jar"/>
+        <include name="tuscany-binding-ws-axis2-1.4.jar"/>
+        <include name="tuscany-binding-ws-axis2-policy-1.4.jar"/>
+        <include name="tuscany-binding-ws-wsdlgen-1.4.jar"/>
+        <include name="tuscany-binding-ws-xml-1.4.jar"/>
+        <include name="tuscany-contribution-1.4.jar"/>
+        <include name="tuscany-contribution-impl-1.4.jar"/>
+        <include name="tuscany-contribution-java-1.4.jar"/>
+        <include name="tuscany-contribution-namespace-1.4.jar"/>
+        <include name="tuscany-contribution-resource-1.4.jar"/>
+        <include name="tuscany-contribution-xml-1.4.jar"/>
+        <include name="tuscany-core-1.4.jar"/>
+        <include name="tuscany-core-databinding-1.4.jar"/>
+        <include name="tuscany-core-spi-1.4.jar"/>
+        <include name="tuscany-data-api-1.4.jar"/>
+        <include name="tuscany-databinding-1.4.jar"/>
+        <include name="tuscany-databinding-axiom-1.4.jar"/>
+        <include name="tuscany-databinding-jaxb-1.4.jar"/>
+        <include name="tuscany-databinding-jaxb-axiom-1.4.jar"/>
+        <include name="tuscany-databinding-json-1.4.jar"/>
+        <include name="tuscany-databinding-sdo-1.4.jar"/>
+        <include name="tuscany-definitions-1.4.jar"/>
+        <include name="tuscany-definitions-xml-1.4.jar"/>
+        <include name="tuscany-domain-manager-1.4.jar"/>
+        <include name="tuscany-endpoint-1.4.jar"/>
+        <include name="tuscany-extensibility-1.4.jar"/>
+        <include name="tuscany-host-embedded-1.4.jar"/>
+        <include name="tuscany-host-http-1.4.jar"/>
+        <include name="tuscany-host-jetty-1.4.jar"/>
+        <include name="tuscany-implementation-bpel-1.4.jar"/>
+        <include name="tuscany-implementation-bpel-ode-1.4.jar"/>
+        <include name="tuscany-implementation-ejb-1.4.jar"/>
+        <include name="tuscany-implementation-java-1.4.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.4.jar"/>
+        <include name="tuscany-implementation-java-xml-1.4.jar"/>
+        <include name="tuscany-implementation-node-1.4.jar"/>
+        <include name="tuscany-implementation-node-runtime-1.4.jar"/>
+        <include name="tuscany-implementation-resource-1.4.jar"/>
+        <include name="tuscany-implementation-resource-runtime-1.4.jar"/>
+        <include name="tuscany-implementation-widget-1.4.jar"/>
+        <include name="tuscany-implementation-widget-runtime-1.4.jar"/>
+        <include name="tuscany-interface-1.4.jar"/>
+        <include name="tuscany-interface-java-1.4.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.4.jar"/>
+        <include name="tuscany-interface-java-xml-1.4.jar"/>
+        <include name="tuscany-interface-wsdl-1.4.jar"/>
+        <include name="tuscany-interface-wsdl-xml-1.4.jar"/>
+        <include name="tuscany-monitor-1.4.jar"/>
+        <include name="tuscany-node-api-1.4.jar"/>
+        <include name="tuscany-node-impl-1.4.jar"/>
+        <include name="tuscany-node-launcher-1.4.jar"/>
+        <include name="tuscany-node-manager-1.4.jar"/>
+        <include name="tuscany-policy-1.4.jar"/>
+        <include name="tuscany-policy-security-1.4.jar"/>
+        <include name="tuscany-policy-xml-1.4.jar"/>
+        <include name="tuscany-policy-xml-ws-1.4.jar"/>
+        <include name="tuscany-sca-api-1.4.jar"/>
+        <include name="tuscany-sca-api-extension-1.4.jar"/>
+        <include name="tuscany-workspace-1.4.jar"/>
+        <include name="tuscany-workspace-impl-1.4.jar"/>
+        <include name="tuscany-workspace-xml-1.4.jar"/>
+        <include name="tuscany-xsd-1.4.jar"/>
+        <include name="tuscany-xsd-xml-1.4.jar"/>
     </fileset>
-    <fileset id="3rdparty.jars" dir="../../lib">
+    <fileset id="3rdparty.jars" dir="${env.TUSCANY}/lib">
         <include name="XmlSchema-1.4.2.jar"/>
         <include name="abdera-client-0.4.0-incubating.jar"/>
         <include name="abdera-core-0.4.0-incubating.jar"/>
@@ -161,7 +162,7 @@
         <include name="axis2-mtompolicy-1.4.1.jar"/>
         <include name="backport-util-concurrent-3.1.jar"/>
         <include name="bcprov-jdk13-132.jar"/>
-        <include name="cglib-nodep-2.2.jar"/>
+        <include name="cglib-nodep-2.1_3.jar"/>
         <include name="common-2.2.3.jar"/>
         <include name="commons-codec-1.3.jar"/>
         <include name="commons-collections-3.1.jar"/>
@@ -180,6 +181,7 @@
         <include name="ecore-xmi-2.2.3.jar"/>
         <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
         <include name="geronimo-common-1.2-beta.jar"/>
+        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
         <include name="geronimo-connector-1.2-beta.jar"/>
         <include name="geronimo-core-1.2-beta.jar"/>
         <include name="geronimo-deployment-1.2-beta.jar"/>
diff --git a/sandbox/travelsample/chapter-05/node/pom.xml b/sandbox/travelsample/chapter-05/node/pom.xml
index d42e8b2fa6..077173d8eb 100644
--- a/sandbox/travelsample/chapter-05/node/pom.xml
+++ b/sandbox/travelsample/chapter-05/node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>1.4</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-05-node</artifactId>
@@ -32,103 +32,103 @@
             <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -161,11 +161,11 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.5-SNAPSHOT</version>
+                <version>1.4</version>
                 <executions>
                     <execution>
                         <configuration>
-                            <mainClass>launch.LaunchTutorialAdmin</mainClass>
+                            <mainClass>scatours.LaunchNode</mainClass>
                         </configuration>
                         <goals>
                             <goal>generate</goal>
diff --git a/sandbox/travelsample/chapter-05/node/src/scatours/LaunchNode.java b/sandbox/travelsample/chapter-05/node/src/scatours/LaunchNode.java
index 777963c13e..61ec7e3a30 100644
--- a/sandbox/travelsample/chapter-05/node/src/scatours/LaunchNode.java
+++ b/sandbox/travelsample/chapter-05/node/src/scatours/LaunchNode.java
@@ -45,7 +45,7 @@ public class LaunchNode {
                                                                new SCAContribution("trip", "../../shared-contributions/trip-contribution/target/classes"),
                                                                new SCAContribution("tripbooking", "../../shared-contributions/tripbooking-contribution/target/classes"),
                                                                new SCAContribution("travelcatalog", "../../shared-contributions/travelcatalog-contribution/target/classes"),
-                                                               new SCAContribution("payment", "../../shared-contributions/payment-contribution/target/classes"),
+                                                               //new SCAContribution("payment", "../../shared-contributions/payment-contribution/target/classes"),
                                                                new SCAContribution("emailgateway", "../../shared-contributions/emailgateway-contribution/target/classes"),
                                                                new SCAContribution("shoppingcart", "../../shared-contributions/shoppingcart-contribution/target/classes"),
                                                                new SCAContribution("scatours", "../../shared-contributions/scatours-contribution/target/classes"),
diff --git a/sandbox/travelsample/chapter-05/pom.xml b/sandbox/travelsample/chapter-05/pom.xml
index 8ea9d0f8cf..b358ed5804 100644
--- a/sandbox/travelsample/chapter-05/pom.xml
+++ b/sandbox/travelsample/chapter-05/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-chapter-05</artifactId>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/pom.xml b/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
index e840ef994c..b896a8cda6 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>1.4</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-05-ui-contribution</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>test</scope>
         </dependency> 
 
@@ -85,7 +85,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.5-SNAPSHOT</version>
+                <version>1.4</version>
                 <executions>
                     <execution>
                         <configuration>