From: <ge...@us...> - 2010-08-31 09:16:40
|
Revision: 12613 http://exist.svn.sourceforge.net/exist/?rev=12613&view=rev Author: gev Date: 2010-08-31 09:16:34 +0000 (Tue, 31 Aug 2010) Log Message: ----------- [ignore] signing/unsigning ant tasks for netedit and required jars Modified Paths: -------------- trunk/eXist/build/scripts/build-impl.xml trunk/eXist/build/scripts/jarsigner.xml Added Paths: ----------- trunk/eXist/extensions/netedit/jarsigner.xml Modified: trunk/eXist/build/scripts/build-impl.xml =================================================================== --- trunk/eXist/build/scripts/build-impl.xml 2010-08-30 16:52:04 UTC (rev 12612) +++ trunk/eXist/build/scripts/build-impl.xml 2010-08-31 09:16:34 UTC (rev 12613) @@ -11,6 +11,9 @@ <!-- setup properties --> <property file="${basedir}/build.properties" /> + <property file="${basedir}/extensions/local.build.properties"/> + <property file="${basedir}/extensions/build.properties"/> + <property name="jetty.dir" value="tools/jetty"/> <property name="src" value="./src"/> <property name="src.webapp" value="./webapp"/> @@ -51,6 +54,10 @@ <available file="${catalina.home}/bin" property="catalina.present"/> <available file="key.store" property="key.store.present"/> + <condition property="include.feature.netedit.config"> + <istrue value="${include.feature.netedit}"/> + </condition> + <!-- check build file for index extensions --> <uptodate property="extensions.uptodate" srcfile="${build.extensions.indexes}/modules.xml" targetfile="${build.extensions.indexes}/build.xml"/> @@ -732,7 +739,7 @@ <echo message="!! Signing jar files ..."/> <echo message="!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/> <ant antfile="build/scripts/jarsigner.xml" dir="." target="jnlp-sign-exist"/> - + <echo message="!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/> <echo message="!! Please run '$EXIST_HOME/build.[bat|sh] -f build\scripts\jarsigner.xml' "/> <echo message="!! once manually to use a default keystore to sign the core jars or put !!"/> @@ -741,9 +748,30 @@ <!-- the core jars can NOT be signed in this build.xml file because --> <!-- the jars are some how locked by ant (classpath.core)--> - + + <antcall target="sign-netedit"/> + </target> - + + <!-- ============================================================================ --> + <!-- Sign jar files for netedit client --> + <!-- --> + <!-- ============================================================================ --> + <target name="sign-netedit" if="include.feature.netedit.config"> + + <echo message="!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/> + <echo message="!! Signing jar files ..."/> + <echo message="!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/> + <ant antfile="extensions/netedit/jarsigner.xml" dir="." target="jnlp-sign-netedit"/> + + <echo message="!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/> + <echo message="!! Please run '$EXIST_HOME/build.[bat|sh] -f extensions\netedit\jarsigner.xml' "/> + <echo message="!! once manually to use a default keystore to sign the required jars or put !!"/> + <echo message="!! your own certificate in $EXIST_HOME/key.store and sign for enabling netedit client !!"/> + <echo message="!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/> + + </target> + <!-- ====================================================== --> <!-- Generate build files for index extensions --> <!-- ====================================================== --> Modified: trunk/eXist/build/scripts/jarsigner.xml =================================================================== --- trunk/eXist/build/scripts/jarsigner.xml 2010-08-30 16:52:04 UTC (rev 12612) +++ trunk/eXist/build/scripts/jarsigner.xml 2010-08-31 09:16:34 UTC (rev 12613) @@ -119,6 +119,13 @@ <fileset dir="lib/core"> <include name="*.jar"/> </fileset> + <fileset dir="lib/extensions"> + <include name="exist-netedit.jar"/> + </fileset> + <fileset dir="lib/optional"> + <include name="commons-codec-*.jar"/> + <include name="commons-httpclient-*.jar"/> + </fileset> </unsignjar> </target> Added: trunk/eXist/extensions/netedit/jarsigner.xml =================================================================== --- trunk/eXist/extensions/netedit/jarsigner.xml (rev 0) +++ trunk/eXist/extensions/netedit/jarsigner.xml 2010-08-31 09:16:34 UTC (rev 12613) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project basedir="../.." default="jnlp-sign-netedit-all" name="sign netedit"> + + <property file="build.properties"/> + + <property file="extensions/local.build.properties"/> + <property file="extensions/build.properties"/> + + <condition property="include.feature.netedit.config"> + <istrue value="${include.feature.netedit}"/> + </condition> + + + <import file="${basedir}/build/scripts/jarsigner.xml"/> + + <target name="jnlp-sign-netedit" depends="jnlp-prepare,jnlp-keygen" if="include.feature.netedit.config"> + <echo message="Signing exist-netedit.jar ..."/> + <signjar alias="${keystore.alias}" storepass="${keystore.password}" + keystore="${keystore.file}"> + + <fileset dir="${lib.extensions}"> + <include name="exist-netedit.jar"/> + </fileset> + </signjar> + </target> + + <target name="jnlp-sign-netedit-required" depends="jnlp-prepare,jnlp-keygen" if="include.feature.netedit.config"> + <echo message="Signing exist-netedit required jars ..."/> + <signjar alias="${keystore.alias}" storepass="${keystore.password}" + keystore="${keystore.file}"> + + <fileset dir="${lib.core}"> + <include name="commons-logging-*.jar"/> + </fileset> + <fileset dir="${lib.optional}"> + <include name="commons-codec-*.jar"/> + <include name="commons-httpclient-*.jar"/> + </fileset> + </signjar> + </target> + + <target name="jnlp-sign-netedit-all" + depends="jnlp-prepare,jnlp-keygen,jnlp-sign-netedit,jnlp-sign-netedit-required" + if="include.feature.netedit.config"/> + + +</project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |