[ 
https://issues.apache.org/jira/browse/TUSCANY-3449?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Luciano Resende resolved TUSCANY-3449.
--------------------------------------

    Resolution: Fixed

Fixed in 1.6 branch for all samples going to binary distro. We need to review 
all samples in 1.x and apply similar fix in 2.x if required as well. Below is 
the updates I added to the build-dojo.xml.

Two things to note:
   - build.xml need to call unpack-dojo-files-nomaven
   - some samples require dojo dijit==> <include 
name="dojo-release-${dojo.version}/dijit/**"/>

    <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}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
    </target>

    <target name="unpack-dojo-files-nomaven" 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-release-${dojo.version}/dojo/**"/>
                <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
                <exclude name="dojo-release-${dojo.version}/dijit/**"/>
                <exclude name="dojo-release-${dojo.version}/dojox/**"/>
                <exclude name="dojo-release-${dojo.version}/util/**"/>
            </patternset>
        </unzip>
        <move 
file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
              tofile="${unpack.location}"
              verbose="true"/>
        <delete dir="${basedir}/target/dojo-unpack-temp/"/>
    </target>

> Dojo install script fails when running from binary distribution ant script
> --------------------------------------------------------------------------
>
>                 Key: TUSCANY-3449
>                 URL: https://issues.apache.org/jira/browse/TUSCANY-3449
>             Project: Tuscany
>          Issue Type: Bug
>          Components: Java SCA Samples
>    Affects Versions: Java-SCA-1.6
>            Reporter: Luciano Resende
>            Assignee: Luciano Resende
>            Priority: Blocker
>             Fix For: Java-SCA-1.6
>
>
> Looks like there are some differences from when using the dojoxxx.zip from 
> maven and directly from dojotoolkit download place.
> This is causing some problems in the 1.6 release, and it also seems that some 
> samples are using different approaches to unzip the archives
> When the dojo-1.3.0.zip is retrieved from a maven repo, it will extract to 
> dojo-1.3.0, thus matchin the pattern we have in the build-dojo.xml
>  <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>
> The following samples are configured for this option : demos-bigbank, 
> helloworld-dojo-webapp and simple-bigbank-spring
> When the dojo-1.3.0.zip is retrieved from a dojotolkit download website 
> (http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip),
>  it will extract to dojo-release-1.3.0, and then we need something different 
> in the build-dojo.xml
> <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-release-${dojo.version}/dojo/**"/>
>                 <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
>                 <exclude name="dojo-release-${dojo.version}/dijit/**"/>
>                 <exclude name="dojo-release-${dojo.version}/dojox/**"/>
>                 <exclude name="dojo-release-${dojo.version}/util/**"/>
>             </patternset>
>         </unzip>
> The following samples are configured this way: alert-aggregator-webapp, 
> bigbank-account

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.

Reply via email to