Moving to latest dojo release (1.5.0)

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

7 files changed, 50 insertions, 143 deletions

diff --git a/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml b/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml
index 3a0c0fd87f..85bdaa4c42 100644
--- a/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml
+++ b/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml
@@ -18,12 +18,14 @@
  * under the License.
 -->
 <project name="DojoZipInstaller">
-	
 
-    <property name="dojo.version" value="1.3.0"/>
+    <property name="dojo.version" value="${dojoVersion}"/>
+	<echo message="${dojo.version}"/>
 	<property name="dojo.zip" value="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
+	<echo message="${dojo.zip}"/>
     <property name="unpack.location" value="${basedir}/src/main/resources/dojo"/>
-	
+	<echo message="${unpack.location}"/>
+
 
     <target name="check-dojo-installed">
         <condition property="already.installed" >
@@ -40,7 +42,7 @@
     <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
         <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
         <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
-        <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"
+        <unzip src="${dojo.zip}"
                dest="${basedir}/target/dojo-unpack-temp/"
                overwrite="false"
         	   encoding="native-encoding">
@@ -57,7 +59,7 @@
               verbose="true"/>
         <delete dir="${basedir}/target/dojo-unpack-temp/"/>
     </target>
-	
+
     <target name="clean-dojo-files">
         <delete dir="${unpack.location}"/>
     </target>
diff --git a/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml b/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
index 47ff6f5a9b..744c4f27dd 100644
--- a/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
+++ b/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
@@ -35,31 +35,31 @@
             <artifactId>tuscany-core</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>        
+        </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
+
 		<dependency>
 		   <groupId>org.dojotoolkit</groupId>
 		   <artifactId>dojo</artifactId>
-		   <version>1.3.0</version>
+		   <version>1.5.0</version>
 		   <type>zip</type>
-		</dependency>        
+		</dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -94,6 +94,7 @@
                                 <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
                                     <property name="localRepository" value="${settings.localRepository}"/>
                                     <property name="artifactId" value="${project.artifactId}"/>
+                                    <property name="dojoVersion" value="${dojo.version}"/>
                                 </ant>
                             </tasks>
                         </configuration>
@@ -109,6 +110,7 @@
                                 <ant antfile="./build-dojo.xml" target="clean-dojo-files">
                                     <property name="localRepository" value="${settings.localRepository}"/>
                                     <property name="artifactId" value="${project.artifactId}"/>
+                                    <property name="dojoVersion" value="${dojo.version}"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml
index eb8bd06c49..5c25e0a63f 100644
--- a/sca-java-2.x/trunk/pom.xml
+++ b/sca-java-2.x/trunk/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>7</version>
+        <version>8</version>
     </parent>
 
     <!-- ====================================================================== -->
@@ -48,6 +48,7 @@
     <properties>
         <notice.dir>.</notice.dir>
         <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
+        <dojo.version>1.5.0</dojo.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>        
     </properties>
@@ -73,7 +74,17 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-
+        <repository>
+            <id>maven.org</id>
+            <name>Maven.org</name> <!-- dojo.dojotoolit repository -->
+            <url>http://repo2.maven.org/maven2/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>        
     </repositories>
 
     <!-- ====================================================================== -->
diff --git a/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml b/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
index 190ed73d98..a5c999bafa 100644
--- a/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
@@ -7,15 +7,15 @@
     * to you under the Apache License, Version 2.0 (the
     * "License"); you may not use this file except in compliance
     * with the License.  You may obtain a copy of the License at
-    * 
+    *
     *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
+    *
     * Unless required by applicable law or agreed to in writing,
     * software distributed under the License is distributed on an
     * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     * KIND, either express or implied.  See the License for the
     * specific language governing permissions and limitations
-    * under the License.    
+    * under the License.
 -->
 <project>
     <modelVersion>4.0.0</modelVersion>
@@ -82,8 +82,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript-dojo</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>                
-        
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -93,7 +92,7 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
        <finalName>${project.artifactId}</finalName>
        <plugins>
@@ -108,12 +107,12 @@
 					<!-- context for the webapp, as finalName is not being honored -->
 					<path>/${project.artifactId}</path>
 				</configuration>
-			</plugin>       
+			</plugin>
                   <plugin>
                      <groupId>org.mortbay.jetty</groupId>
                      <artifactId>maven-jetty-plugin</artifactId>
                      <version>6.1.18</version>
-                  </plugin>       
+                  </plugin>
        </plugins>
     </build>
 
diff --git a/sca-java-2.x/trunk/samples/applications/store/pom.xml b/sca-java-2.x/trunk/samples/applications/store/pom.xml
index c9c6c2a639..7917a84aeb 100644
--- a/sca-java-2.x/trunk/samples/applications/store/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/store/pom.xml
@@ -7,15 +7,15 @@
     * to you under the Apache License, Version 2.0 (the
     * "License"); you may not use this file except in compliance
     * with the License.  You may obtain a copy of the License at
-    * 
+    *
     *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
+    *
     * Unless required by applicable law or agreed to in writing,
     * software distributed under the License is distributed on an
     * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     * KIND, either express or implied.  See the License for the
     * specific language governing permissions and limitations
-    * under the License.    
+    * under the License.
 -->
 <project>
     <modelVersion>4.0.0</modelVersion>
@@ -33,15 +33,13 @@
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
 			<version>2.0-SNAPSHOT</version>
-                        <type>pom</type>
+            <type>pom</type>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-data-api</artifactId>
 			<version>2.0-SNAPSHOT</version>
 		</dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-runtime</artifactId>
@@ -77,27 +75,23 @@
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript-dojo</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>                
-        
+        </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
             <version>6.1.19</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <version>2.6</version>
             <scope>test</scope>
         </dependency>
-        
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -105,7 +99,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
        <finalName>${project.artifactId}</finalName>
        <plugins>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml
deleted file mode 100644
index 36714c67fc..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<project name="DojoZipInstaller">

-	

-

-    <property name="dojo.version" value="1.3.0"/>

-	<property name="dojo.zip" value="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>

-    <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>

-	

-

-    <target name="check-dojo-installed">

-        <condition property="already.installed" >

-            <available file="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>

-        </condition>

-    </target>

-

-    <target name="check-dojo-unpacked">

-        <condition property="already.unpacked" >

-            <available file="${unpack.location}"/>

-        </condition>

-    </target>

-

-    <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">

-        <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>

-        <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>

-        <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"

-               dest="${basedir}/target/dojo-unpack-temp/"

-               overwrite="false"

-        	   encoding="native-encoding">

-            <patternset>

-                <include name="dojo-${dojo.version}/dojo/**"/>

-                <exclude name="dojo-${dojo.version}/dojo/tests/**"/>

-                <exclude name="dojo-${dojo.version}/dijit/**"/>

-                <exclude name="dojo-${dojo.version}/dojox/**"/>

-                <exclude name="dojo-${dojo.version}/util/**"/>

-            </patternset>

-        </unzip>

-        <move file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}"

-              tofile="${unpack.location}"

-              verbose="true"/>

-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>

-    </target>

-	

-    <target name="clean-dojo-files">

-        <delete dir="${unpack.location}"/>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
index da55756087..92a4e61f63 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
@@ -7,15 +7,15 @@
     * to you under the Apache License, Version 2.0 (the

     * "License"); you may not use this file except in compliance

     * with the License.  You may obtain a copy of the License at

-    * 

+    *

     *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

+    *

     * Unless required by applicable law or agreed to in writing,

     * software distributed under the License is distributed on an

     * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

     * KIND, either express or implied.  See the License for the

     * specific language governing permissions and limitations

-    * under the License.    

+    * under the License.

 -->

 <project>

     <modelVersion>4.0.0</modelVersion>

@@ -34,20 +34,19 @@
             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-base-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

-        </dependency> 

+        </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

-        

+

         <dependency>

-           <groupId>org.dojotoolkit</groupId>

-           <artifactId>dojo</artifactId>

-           <version>1.3.0</version>

-           <type>zip</type>

-        </dependency>                  

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-web-javascript-dojo</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

 

         <dependency>

             <groupId>junit</groupId>

@@ -66,42 +65,6 @@
              <artifactId>maven-tuscany-plugin</artifactId>

              <version>2.0-SNAPSHOT</version>

           </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>copy-dojo-files</id>

-                        <phase>generate-resources</phase>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                        <configuration>

-                            <tasks>

-                                <ant antfile="./build-dojo.xml" target="unpack-dojo-files">

-                                    <property name="localRepository" value="${settings.localRepository}"/>

-                                    <property name="artifactId" value="${project.artifactId}"/>

-                                </ant>

-                            </tasks>

-                        </configuration>

-                    </execution>

-                    <execution>

-                        <id>clean-dojo-files</id>

-                        <phase>clean</phase>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                        <configuration>

-                            <tasks>

-                                <ant antfile="./build-dojo.xml" target="clean-dojo-files">

-                                    <property name="localRepository" value="${settings.localRepository}"/>

-                                    <property name="artifactId" value="${project.artifactId}"/>

-                                </ant>

-                            </tasks>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>          

           <plugin>

              <groupId>org.mortbay.jetty</groupId>

              <artifactId>maven-jetty-plugin</artifactId>