fix filenam typo

[java-idp.git] / build.xml

diff --git a/build.xml b/build.xml
index 1d29a34..efcc360 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -141,29 +141,6 @@
     <target name="package" depends="compile-core" description="Creates the project library jar file.">
         <mkdir dir="${dist.dir}" />
 
-        <if>
-            <equals arg1="${jdk.target}" arg2="1.4" />
-            <then>
-                <java classname="com.rc.retroweaver.Weaver">
-                    <arg value="-source" />
-                    <arg value="${core-classes.dir}" />
-                    <classpath>
-                        <fileset dir="${thirdpaty-lib.dir}">
-                            <include name="**/*.jar" />
-                        </fileset>
-                    </classpath>
-                </java>
-
-                <echo message="**************************************************************" />
-                <echo message="    Remember, you must include the retroweaver-rt jar" />
-                <echo message="    file, located in the thirdparty-lib directory, along with the" />
-                <echo message="    ${jar.name} on your" />
-                <echo message="    classpath in order to use this with JDK 1.4" />
-                <echo message="**************************************************************" />
-
-            </then>
-        </if>
-
         <jar destfile="${dist.dir}/${jar.name}" whenempty="fail">
             <fileset dir="${classpathres.dir}" />
             <zipfileset dir="${metainf.dir}" prefix="META-INF/" />
@@ -189,8 +166,11 @@
                        addproperty="idp.hostname.input"
                        defaultvalue="${idp.hostname}" />
                 <var name="idp.hostname" value="${idp.hostname.input}" />
+                
+                <input message="A keystore is about to be generated for you. Please enter a password that will be used to protect it."
+                       addproperty="idp.keystore.pass" />
 
-                <propertyfile file="build.properties">
+                <propertyfile file="install.properties">
                     <entry key="idp.home" value="${idp.home.input}" />
                     <entry key="idp.hostname" value="${idp.hostname.input}" />
                 </propertyfile>
@@ -208,10 +188,12 @@
 
                 <regexSplit input="${idp.hostname}" regex="^.*\.(.*\..*$)" addproperty="idp.scope" />
 
-                <echo message="Generating signing and encryption key and certificate. " />
+                <echo message="Generating signing and encryption key, certificate, and keystore. " />
                 <selfSignedCert hostname="${idp.hostname}"
                                 privateKeyFile="${idp.home}/credentials/idp.key"
-                                certificateFile="${idp.home}/credentials/idp.crt" />
+                                certificateFile="${idp.home}/credentials/idp.crt"
+                                keystoreFile="${idp.home}/credentials/idp.jks"
+                                keystorePassword="${idp.keystore.pass}" />
 
                 <copy todir="${idp.home}/bin" preservelastmodified="true">
                     <fileset dir="${tools.dir}" />