Skip to content
Snippets Groups Projects
Commit 45163580 authored by kaloyane's avatar kaloyane
Browse files

bugfix: DSS Upload webstart app does not start because of ANT naming conflicts... 

bugfix: DSS Upload webstart app does not start because of ANT naming conflicts in "datastore_server" and "screening" projects.

SVN: 22753
parent 24ec0336
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
datastore_server/build/build.xml
+ 21
− 21
View file @ 45163580
...@@ -349,83 +349,83 @@ ...@@ -349,83 +349,83 @@
</target> </target>
<target name="make-dist-upload-gui" depends="dss-upload-gui-jar"> <target name="make-dist-upload-gui" depends="dss-upload-gui-jar">
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${dist.dss_upload_gui.lib}" /> <param name="dir" value="${dist.dss_upload_gui.lib}" />
<param name="jar" value="dss_upload_gui.jar" /> <param name="jar" value="dss_upload_gui.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/cisd-base" /> <param name="dir" value="${lib}/cisd-base" />
<param name="jar" value="cisd-base.jar" /> <param name="jar" value="cisd-base.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/cisd-args4j" /> <param name="dir" value="${lib}/cisd-args4j" />
<param name="jar" value="cisd-args4j.jar" /> <param name="jar" value="cisd-args4j.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/cisd-base" /> <param name="dir" value="${lib}/cisd-base" />
<param name="jar" value="cisd-base.jar" /> <param name="jar" value="cisd-base.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/commons-codec" /> <param name="dir" value="${lib}/commons-codec" />
<param name="jar" value="commons-codec.jar" /> <param name="jar" value="commons-codec.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/commons-httpclient" /> <param name="dir" value="${lib}/commons-httpclient" />
<param name="jar" value="commons-httpclient.jar" /> <param name="jar" value="commons-httpclient.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/commons-io" /> <param name="dir" value="${lib}/commons-io" />
<param name="jar" value="commons-io.jar" /> <param name="jar" value="commons-io.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/commons-lang" /> <param name="dir" value="${lib}/commons-lang" />
<param name="jar" value="commons-lang.jar" /> <param name="jar" value="commons-lang.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/commons-logging" /> <param name="dir" value="${lib}/commons-logging" />
<param name="jar" value="commons-logging.jar" /> <param name="jar" value="commons-logging.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/commons-codec" /> <param name="dir" value="${lib}/commons-codec" />
<param name="jar" value="commons-codec.jar" /> <param name="jar" value="commons-codec.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/spring" /> <param name="dir" value="${lib}/spring" />
<param name="jar" value="spring.jar" /> <param name="jar" value="spring.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/spring/third-party" /> <param name="dir" value="${lib}/spring/third-party" />
<param name="jar" value="stream-supporting-httpinvoker.jar" /> <param name="jar" value="stream-supporting-httpinvoker.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/jython" /> <param name="dir" value="${lib}/jython" />
<param name="jar" value="jython.jar" /> <param name="jar" value="jython.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/poi" /> <param name="dir" value="${lib}/poi" />
<param name="jar" value="poi-3.7-20101029.jar" /> <param name="jar" value="poi-3.7-20101029.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/poi" /> <param name="dir" value="${lib}/poi" />
<param name="jar" value="poi-ooxml-3.7-20101029.jar" /> <param name="jar" value="poi-ooxml-3.7-20101029.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/poi" /> <param name="dir" value="${lib}/poi" />
<param name="jar" value="poi-ooxml-schemas-3.7-20101029.jar" /> <param name="jar" value="poi-ooxml-schemas-3.7-20101029.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/log4j" /> <param name="dir" value="${lib}/log4j" />
<param name="jar" value="log4j.jar" /> <param name="jar" value="log4j.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/poi/ooxml-lib" /> <param name="dir" value="${lib}/poi/ooxml-lib" />
<param name="jar" value="dom4j-1.6.1.jar" /> <param name="jar" value="dom4j-1.6.1.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/poi/ooxml-lib" /> <param name="dir" value="${lib}/poi/ooxml-lib" />
<param name="jar" value="geronimo-stax-api_1.0_spec-1.0.jar" /> <param name="jar" value="geronimo-stax-api_1.0_spec-1.0.jar" />
</antcall> </antcall>
<antcall target="copy-and-sign-jar"> <antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/poi/ooxml-lib" /> <param name="dir" value="${lib}/poi/ooxml-lib" />
<param name="jar" value="xmlbeans-2.3.0.jar" /> <param name="jar" value="xmlbeans-2.3.0.jar" />
</antcall> </antcall>
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
</target> </target>
<target name="copy-and-sign-jar"> <target name="copy-and-sign-upload-ui-jar">
<copy file="${dir}/${jar}" todir="${dist.dss_upload_gui.lib}" /> <copy file="${dir}/${jar}" todir="${dist.dss_upload_gui.lib}" />
<signjar jar="${dist.dss_upload_gui.lib}/${jar}" <signjar jar="${dist.dss_upload_gui.lib}/${jar}"
keystore="../openbis/etc/dev.keystore" keystore="../openbis/etc/dev.keystore"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment