perfsonar development work

Author: nina
Date: 2007-11-08 12:23:52 -0500 (Thu, 08 Nov 2007)
New Revision: 3026

Added:
   branches/perfsonarui/ClientSASLCA.jks
Removed:
   branches/perfsonarui/ant/build.xml.bak
Modified:
   branches/perfsonarui/ant/build.xml
Log:
including the temporary keystore needeed from SASL CA 

Added: branches/perfsonarui/ClientSASLCA.jks


Property changes on: branches/perfsonarui/ClientSASLCA.jks
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/perfsonarui/ant/build.xml
===================================================================
--- branches/perfsonarui/ant/build.xml  2007-11-08 17:21:46 UTC (rev 3025)
+++ branches/perfsonarui/ant/build.xml  2007-11-08 17:23:52 UTC (rev 3026)
@@ -131,12 +131,7 @@
                        <includesfile name="${src}/resources.files" />
              </fileset>
            </jar>
-           <!--
-                <signjar       jar="${appdist.dir}/bin/perfSonarApp.jar"
-                                               keystore="${keystore}"
-                                               alias="${alias}" 
storepass="${storepass}"
-                                               keypass="${storepass}"/>
-                                               -->
+
        </target>
 
     <target id="plugin-demo" name="plugin-demo" depends="build">
@@ -158,12 +153,6 @@
                <includesfile name="${src}/plugins.ma.classes" />
       </fileset>
     </jar>
-       <!--
-        <signjar       jar="${appdist.dir}/bin/ext/plugins-ma.jar"
-                                               keystore=".${keystore}"
-                                               alias="${alias}" 
storepass="${storepass}"
-                                               keypass="${storepass}"/>
-           -->
        <!-- ippm -->
         <jar jarfile="${appdist.dir}/bin/ext/plugins-ippm.jar" 
compress="true"
                
manifest="${src}/org/perfsonar/perfsonarui/ippm/MANIFEST_IPPM_plugin.MFT" >
@@ -172,12 +161,6 @@
                <includesfile name="${src}/plugins.ippm.classes" />
           </fileset>
         </jar>
-        <!--
-        <signjar       jar="${appdist.dir}/bin/ext/plugins-ippm.jar"
-                                                       keystore="${keystore}"
-                                                       alias="${alias}" 
storepass="${storepass}"
-                                                       
keypass="${storepass}"/>
-       -->
                <!-- playground -->
             <jar jarfile="${appdist.dir}/bin/ext/plugins-playground.jar" 
compress="true"
                        
manifest="${src}/org/perfsonar/perfsonarui/playground/MANIFEST_PLAYGROUND_plugin.MFT"
 >
@@ -186,12 +169,6 @@
                        <includesfile 
name="${src}/plugins.playground.classes" />
               </fileset>
             </jar>
-            <!--
-                <signjar       
jar="${appdist.dir}/bin/ext/plugins-playground.jar"
-                                                       keystore="${keystore}"
-                                                       alias="${alias}" 
storepass="${storepass}"
-                                                       
keypass="${storepass}"/>
-                                                       -->
 
                <!-- flow selection and aggregation MA client -->
                <jar jarfile="${appdist.dir}/bin/ext/plugins-flowsa.jar" 
compress="true"
@@ -220,12 +197,6 @@
                        <includesfile 
name="${src}/plugins.linkstatus.classes" />
               </fileset>
             </jar>
-            <!--
-                <signjar       
jar="${appdist.dir}/bin/ext/plugins-linkstatus.jar"
-                                                       keystore="${keystore}"
-                                                       alias="${alias}" 
storepass="${storepass}"
-                                                       
keypass="${storepass}"/>
-                                                       -->
 
                        <!-- links -->
             <jar jarfile="${appdist.dir}/bin/ext/plugins-links.jar" 
compress="true"
@@ -235,13 +206,8 @@
                        <includesfile name="${src}/plugins.links.classes" />
               </fileset>
             </jar>
-            <!--
-                <signjar       jar="${appdist.dir}/bin/ext/plugins-links.jar"
-                                                       keystore="${keystore}"
-                                                       alias="${alias}" 
storepass="${storepass}"
-                                                       
keypass="${storepass}"/>
-                                                       -->
 
+
        </target>
 
        <target id="sign" name="sign" >
@@ -253,30 +219,15 @@
                 <signjar       jar="${appdist.dir}/bin/perfSonarApp.jar"
                                                keystore="${keystore}"
                                                alias="${alias}" 
storepass="${storepass}"
-                                               keypass="${storepass}"/>
+                                               keypass="${storepass}"
+                                               verbose="false"/>
 
-                                               <!--
-                       <signjar        
jar="${appdist.dir}/bin/ext/plugins-ma.jar"
-                                               keystore="${keystore}"
-                                               alias="${alias}" 
storepass="${storepass}"
-                                               keypass="${storepass}"/>
-       <signjar        jar="${appdist.dir}/bin/ext/plugins-ippm.jar"
-                                                       keystore="${keystore}"
-                                                       alias="${alias}" 
storepass="${storepass}"
-                                                       
keypass="${storepass}"/>
-
-        <signjar       jar="${appdist.dir}/bin/ext/plugins-playground.jar"
-                                                       keystore="${keystore}"
-                                                       alias="${alias}" 
storepass="${storepass}"
-                                                       
keypass="${storepass}"/>
-
-                               -->
-
                 <signjar
                                keystore="${keystore}"
                                alias="${alias}" storepass="${storepass}"
                                keypass="${storepass}"
-                               lazy="true" >
+                               lazy="true"
+                               verbose="false" >
 
                           <fileset dir="${appdist.dir}/bin/ext" 
includes="**/*.jar" />
                </signjar>
@@ -286,7 +237,8 @@
                                keystore="${keystore}"
                                alias="${alias}" storepass="${storepass}"
                                keypass="${storepass}"
-                               lazy="true" >
+                               lazy="true"
+                               verbose="false">
 
                           <fileset dir="${appdist.dir}/bin/jars" 
includes="**/*.jar" />
                </signjar>
@@ -341,6 +293,8 @@
 
                <copy todir="${appdist.dir}/bin">
                         <fileset dir="." includes="MA.conf" />
+                        <fileset dir="." includes="ClientSASLCA.jks" />
+
                 </copy>
                 <mkdir dir="${appdist.dir}/bin/jars" />
                 <mkdir dir="${appdist.dir}/bin/jars/axis" />

Deleted: branches/perfsonarui/ant/build.xml.bak