diff options
Diffstat (limited to '')
| -rw-r--r-- | sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml | 12 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml | 14 |
2 files changed, 15 insertions, 11 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> |