Switch poms back to depend on 1.5-SNAPSHOT as much of the stuff that I'm adding now depends on 1.x fixes

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

2 files changed, 50 insertions, 43 deletions

diff --git a/sandbox/travelsample/chapter-05/ui-contribution/build.xml b/sandbox/travelsample/chapter-05/ui-contribution/build.xml
index 11d6c40c45..4c14d4dde8 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/build.xml
+++ b/sandbox/travelsample/chapter-05/ui-contribution/build.xml
@@ -22,14 +22,15 @@
     <target name="compile">
         <mkdir dir="target/classes"/>
         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src"/>
+            <src path="src\main\java"/>
             <classpath>
                 <fileset refid="tuscany.jars"/>
                 <fileset refid="3rdparty.jars"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
+            <fileset dir="src\main\resources"/>
+            <fileset dir="src\main\resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-05-ui-contribution.jar" basedir="target/classes">
             <manifest>
@@ -57,48 +58,54 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../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-sca-1.4.jar"/>
-        <include name="tuscany-binding-sca-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-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-databinding-1.4.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4.jar"/>
-        <include name="tuscany-definitions-1.4.jar"/>
-        <include name="tuscany-definitions-xml-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-implementation-node-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-monitor-1.4.jar"/>
-        <include name="tuscany-node-api-1.4.jar"/>
-        <include name="tuscany-node-impl-1.4.jar"/>
-        <include name="tuscany-policy-1.4.jar"/>
-        <include name="tuscany-policy-xml-1.4.jar"/>
-        <include name="tuscany-sca-api-1.4.jar"/>
-        <include name="tuscany-sca-api-extension-1.4.jar"/>
-        <include name="tuscany-xsd-1.4.jar"/>
+        <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-sca-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-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-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-databinding-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-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-implementation-node-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-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-policy-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-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-xsd-1.5-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
         <include name="activation-1.1.jar"/>
         <include name="asm-all-3.1.jar"/>
-        <include name="cglib-nodep-2.1_3.jar"/>
-        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+        <include name="axiom-api-1.2.7.jar"/>
+        <include name="axiom-impl-1.2.7.jar"/>
+        <include name="cglib-nodep-2.2.jar"/>
+        <include name="commons-logging-1.1.1.jar"/>
+        <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
+        <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
+        <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
         <include name="jaxb-api-2.1.jar"/>
         <include name="jaxb-impl-2.1.7.jar"/>
+        <include name="jaxen-1.1.1.jar"/>
         <include name="jaxws-api-2.1.jar"/>
         <include name="jsr181-api-1.0-MR1.jar"/>
         <include name="jsr250-api-1.0.jar"/>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/pom.xml b/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
index bc9399e9d8..a51f04ce59 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.4</version>
+        <version>1.5-SNAPSHOT</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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4</version>
+                <version>1.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>