You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2006/03/14 15:18:55 UTC

svn commit: r385808 - in /webservices/axis/trunk/c: ./ build/ tools/org/apache/axis/tools/asc4Ant/

Author: prestonf
Date: Tue Mar 14 06:18:52 2006
New Revision: 385808

URL: http://svn.apache.org/viewcvs?rev=385808&view=rev
Log:
Additional packaging scripts to create 'md5' and 'asc' files.  Use ant -f package.xml ApacheRelease

Added:
    webservices/axis/trunk/c/tools/org/apache/axis/tools/asc4Ant/
    webservices/axis/trunk/c/tools/org/apache/axis/tools/asc4Ant/asc4Ant.java
Modified:
    webservices/axis/trunk/c/build/build.AIX.properties
    webservices/axis/trunk/c/build/build.AIX64.properties
    webservices/axis/trunk/c/build/build.HP-UX.properties
    webservices/axis/trunk/c/build/build.Linux.properties
    webservices/axis/trunk/c/build/build.OS400.properties
    webservices/axis/trunk/c/build/build.SunOS.properties
    webservices/axis/trunk/c/build/build.Win32.properties
    webservices/axis/trunk/c/package.xml

Modified: webservices/axis/trunk/c/build/build.AIX.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/build.AIX.properties?rev=385808&r1=385807&r2=385808&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/build.AIX.properties (original)
+++ webservices/axis/trunk/c/build/build.AIX.properties Tue Mar 14 06:18:52 2006
@@ -22,6 +22,11 @@
 ########################################
 dir.wsdl2ws = ${dir.release}/lib/axis
 
+########################################
+# Location of gpg keys and databases   #
+########################################
+gpgdir=~/.gnupg
+
 # Prefix and suffix used for executables and libraries
 # Typical values are:
 #   For windows:

Modified: webservices/axis/trunk/c/build/build.AIX64.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/build.AIX64.properties?rev=385808&r1=385807&r2=385808&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/build.AIX64.properties (original)
+++ webservices/axis/trunk/c/build/build.AIX64.properties Tue Mar 14 06:18:52 2006
@@ -15,10 +15,16 @@
 
 # Set the following to true if you wish the API documentation be generated
 documentation = false
+
 ########################################
 # Location of wsdl2ws for Deliverables #
 ########################################
 dir.wsdl2ws = ${dir.release}/lib/axis
+
+########################################
+# Location of gpg keys and databases   #
+########################################
+gpgdir=~/.gnupg
 
 # Prefix and suffix used for executables and libraries
 # Typical values are:

Modified: webservices/axis/trunk/c/build/build.HP-UX.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/build.HP-UX.properties?rev=385808&r1=385807&r2=385808&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/build.HP-UX.properties (original)
+++ webservices/axis/trunk/c/build/build.HP-UX.properties Tue Mar 14 06:18:52 2006
@@ -15,6 +15,11 @@
 
 HTTP.SSLChannel = false
 
+########################################
+# Location of gpg keys and databases   #
+########################################
+gpgdir=~/.gnupg
+
 # Prefix and suffix used for executables and libraries
 # Typical values are:
 #   For windows:

Modified: webservices/axis/trunk/c/build/build.Linux.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/build.Linux.properties?rev=385808&r1=385807&r2=385808&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/build.Linux.properties (original)
+++ webservices/axis/trunk/c/build/build.Linux.properties Tue Mar 14 06:18:52 2006
@@ -15,6 +15,11 @@
 
 HTTP.SSLChannel = true
 
+########################################
+# Location of gpg keys and databases   #
+########################################
+gpgdir=~/.gnupg
+
 # Prefix and suffix used for executables and libraries
 # Typical values are:
 #   For windows:

Modified: webservices/axis/trunk/c/build/build.OS400.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/build.OS400.properties?rev=385808&r1=385807&r2=385808&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/build.OS400.properties (original)
+++ webservices/axis/trunk/c/build/build.OS400.properties Tue Mar 14 06:18:52 2006
@@ -66,6 +66,11 @@
 ########################################
 dir.wsdl2ws = ${dir.release}/lib/axis
 
+########################################
+# Location of gpg keys and databases   #
+########################################
+gpgdir=~/.gnupg
+
 # Prefix and suffix used for executables and libraries
 # Typical values are:
 #   For windows:

Modified: webservices/axis/trunk/c/build/build.SunOS.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/build.SunOS.properties?rev=385808&r1=385807&r2=385808&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/build.SunOS.properties (original)
+++ webservices/axis/trunk/c/build/build.SunOS.properties Tue Mar 14 06:18:52 2006
@@ -21,6 +21,11 @@
 ########################################
 dir.wsdl2ws = ${dir.release}/lib/axis
 
+########################################
+# Location of gpg keys and databases   #
+########################################
+gpgdir=~/.gnupg
+
 # Prefix and suffix used for executables and libraries
 # Typical values are:
 #   For windows:

Modified: webservices/axis/trunk/c/build/build.Win32.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/build.Win32.properties?rev=385808&r1=385807&r2=385808&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/build.Win32.properties (original)
+++ webservices/axis/trunk/c/build/build.Win32.properties Tue Mar 14 06:18:52 2006
@@ -83,8 +83,10 @@
 ## Values used for Apache 2.0
 apache20.serverLibraryName = mod_axis2
 
-
-
+########################################
+# Location of gpg keys and databases   #
+########################################
+gpgdir=/GPG
 
 # Prefix and suffix used for executables and libraries
 # Typical values are:

Modified: webservices/axis/trunk/c/package.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/package.xml?rev=385808&r1=385807&r2=385808&view=diff
==============================================================================
--- webservices/axis/trunk/c/package.xml (original)
+++ webservices/axis/trunk/c/package.xml Tue Mar 14 06:18:52 2006
@@ -27,6 +27,7 @@
 Please use these to configure directories to suit the needs of your system.
 	</description>
 	<import file="${basedir}/build/buildInitialize.xml"/>
+	<import file="${basedir}/build/buildTools.xml"/>
 
 	<target name="copySource">
 		<mkdir dir="${dir.release}"/>
@@ -301,10 +302,7 @@
            +==> md5Checksum
  -->
 
-  <target name="ApacheRelease" depends="initialize" description="Once the Apache Client has been packaged, two additional files need to be created for both the source and binary zip/tar files.  These are the 'md5' and 'asc' files.">
-    <antcall target="md5Checksums">
-      <param name="dir.properties" value="${basedir}/../.."/>
-    </antcall>
+  <target name="ApacheRelease" depends="initialize, md5Checksums, ascFiles" description="Once the Apache Client has been packaged, two additional files need to be created for both the source and binary zip/tar files.  These are the 'md5' and 'asc' files.">
   </target>
 
   <target name="md5Checksums" depends="packageWindowsDeliverableName, packageUnixDeliverableName">
@@ -343,13 +341,47 @@
   </target>
 	
   <target name="packageUnixDeliverableName" unless="windows">
-    <property name="zipNameBin" value="${dir.zips}/${release}-bin.tar"/>
-    <property name="zipNameSrc" value="${dir.zips}/${release}-src.tar"/>
-    <property name="zipNameTraceBin" value="${dir.zips}/${release}-trace-bin.tar"/>
-    <property name="zipNameTraceSrc" value="${dir.zips}/${release}-trace-src.tar"/>
+    <property name="zipNameBin" value="${dir.zips}/${release}-bin.tar.gz"/>
+    <property name="zipNameSrc" value="${dir.zips}/${release}-src.tar.gz"/>
+    <property name="zipNameTraceBin" value="${dir.zips}/${release}-trace-bin.tar.gz"/>
+    <property name="zipNameTraceSrc" value="${dir.zips}/${release}-trace-src.tar.gz"/>
   </target>
 
-  <target name="ascFiles">
+  <target name="ascFiles" depends="initialize, packageWindowsDeliverableName, packageUnixDeliverableName, buildTools">
+    <if>
+      <available file="${basedir}/../../SecurityKeys/Apache_1_6/gpg/KEYS"/>
+      <then>
+        <copy file="${basedir}/../../SecurityKeys/Apache_1_6/gpg/KEYS" tofile="${basedir}/KEYS"/>
+        <copy file="${basedir}/../../SecurityKeys/Apache_1_6/gpg/password_gpg" tofile="${basedir}/password_gpg"/>
+        <mkdir dir="${gpgdir}"/>
+        <copy todir="${gpgdir}">
+          <fileset dir="${basedir}/../../SecurityKeys/Apache_1_6/gpg">
+            <exclude name="KEYS"/>
+            <exclude name="password_gpg"/>
+          </fileset>
+        </copy>
+        <java classname="org.apache.axis.tools.asc4Ant.asc4Ant" fork="true" failonerror="true">
+          <classpath refid="tracecp"/>
+          <arg value="${zipNameTraceBin}"/>
+          <arg value="${basedir}/password_gpg"/>
+        </java>
+        <java classname="org.apache.axis.tools.asc4Ant.asc4Ant" fork="true" failonerror="true">
+          <classpath refid="tracecp"/>
+          <arg value="${zipNameTraceSrc}"/>
+          <arg value="${basedir}/password_gpg"/>
+        </java>
+        <java classname="org.apache.axis.tools.asc4Ant.asc4Ant" fork="true" failonerror="true">
+          <classpath refid="tracecp"/>
+          <arg value="${zipNameBin}"/>
+          <arg value="${basedir}/password_gpg"/>
+        </java>
+        <java classname="org.apache.axis.tools.asc4Ant.asc4Ant" fork="true" failonerror="true">
+          <classpath refid="tracecp"/>
+          <arg value="${zipNameSrc}"/>
+          <arg value="${basedir}/password_gpg"/>
+        </java>
+      </then>
+    </if>
   </target>
 
 </project>

Added: webservices/axis/trunk/c/tools/org/apache/axis/tools/asc4Ant/asc4Ant.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tools/org/apache/axis/tools/asc4Ant/asc4Ant.java?rev=385808&view=auto
==============================================================================
--- webservices/axis/trunk/c/tools/org/apache/axis/tools/asc4Ant/asc4Ant.java (added)
+++ webservices/axis/trunk/c/tools/org/apache/axis/tools/asc4Ant/asc4Ant.java Tue Mar 14 06:18:52 2006
@@ -0,0 +1,57 @@
+/*
+ * Created on 08-Mar-2006
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.apache.axis.tools.asc4Ant;
+
+import java.io.File;
+
+
+/**
+ * @author Administrator
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class asc4Ant
+{
+
+    public static void main(String[] args)
+    {
+        if( args.length == 2)
+        {
+            String filename = args[0];
+            String passwordFile = args[1];
+        
+	        try
+	        {
+	            String osName = System.getProperty("os.name");
+	            String cmdPrefix = "";
+	
+	            if( osName.startsWith( "Windows"))
+	            {
+	                cmdPrefix = "cmd /C ";
+	            }
+	            else
+	            {
+	                System.out.println( "Oh oh, haven't done that yet!");
+	            }
+	            
+	            if( new File( filename).exists())
+	            {
+		            String cmdLine = cmdPrefix + "gpg --no-secmem-warning --yes --armor --passphrase-fd 0 --output " + filename + ".asc --detach-sig " + filename + " < " + passwordFile;
+		            Runtime rt = Runtime.getRuntime();
+		            Process proc = rt.exec( cmdLine);
+		            
+	                proc.waitFor();
+	            }
+	        }
+	        catch( Throwable t)
+	        {
+	            t.printStackTrace();
+	        }
+        }
+    }
+}