diff options
Diffstat (limited to 'sandbox/lresende')
| -rw-r--r-- | sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml | 56 | ||||
| -rw-r--r-- | sandbox/lresende/sca/samples/store-secure-webapp/pom.xml | 44 |
2 files changed, 28 insertions, 72 deletions
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml b/sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml index 040e6d6a89..6167eba10e 100644 --- a/sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml +++ b/sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml @@ -18,24 +18,16 @@ * under the License. --> <project name="DojoZipInstaller"> - - - <property name="dojo.version" value="1.3.0b3"/> - <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/> + <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/resources/dojo"/> <target name="check-dojo-installed"> <condition property="already.installed" > - <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> - </condition> - <condition property="maven.suffix" value=""> - <os family="unix"/> - </condition> - <condition property="maven.suffix" value=".bat"> - <os family="windows"/> + <available file="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> </condition> </target> - <target name="check-dojo-unpacked"> <condition property="already.unpacked" > @@ -43,49 +35,27 @@ </condition> </target> - <target name="install-dojo" depends="check-dojo-installed" unless="already.installed"> - <mkdir dir="${basedir}/target/dojo-download/"/> - <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip" - dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" - verbose="true" - usetimestamp="true"/> - <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false"> - <arg line="install:install-file -DgroupId=dojo -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/> - </exec> - </target> - - <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed"> - <mkdir dir="${basedir}/target/dojo-download/"/> - <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip" - dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" - verbose="true" - usetimestamp="true"/> - <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" - tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> - </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}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip" + <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip" dest="${basedir}/target/dojo-unpack-temp/" - overwrite="false"> + overwrite="false" + encoding="native-encoding"> <patternset> - <include name="dojo-release-${dojo.version}/dojo/**"/> - <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/> - <include name="dojo-release-${dojo.version}/dijit/**"/> - <exclude name="dojo-release-${dojo.version}/dojox/**"/> - <exclude name="dojo-release-${dojo.version}/util/**"/> + <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-release-${dojo.version}" + <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> diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml b/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml index 2c1c2b2fe2..fd401a0764 100644 --- a/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml +++ b/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.7-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>sample-store-secure-webapp</artifactId> @@ -40,39 +40,39 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-webapp</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.7-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.7-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.7-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-security</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.7-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-security-http</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.7-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-security-geronimo</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.7-SNAPSHOT</version> </dependency> <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 --> @@ -106,31 +106,17 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <!-- version>1.1</version --> + <!-- version>1.1</version --> <dependencies> <dependency> <groupId>ant</groupId> <artifactId>ant-trax</artifactId> <version>1.6.5</version> </dependency> - </dependencies> + </dependencies> <executions> - <execution> - <id>install-dojo</id> - <phase>validate</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="./build-dojo.xml" target="install-dojo"> - <property name="localRepository" value="${settings.localRepository}"/> - </ant> - </tasks> - </configuration> - </execution> - <execution> - <id>copy-dojo-files</id> + <execution> + <id>copy-dojo-files</id> <phase>generate-resources</phase> <goals> <goal>run</goal> @@ -144,8 +130,8 @@ </tasks> </configuration> </execution> - <execution> - <id>clean-dojo-files</id> + <execution> + <id>clean-dojo-files</id> <phase>clean</phase> <goals> <goal>run</goal> @@ -160,7 +146,7 @@ </configuration> </execution> </executions> - </plugin> - </plugins> + </plugin> + </plugins> </build> </project> |