Finish up build

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2717 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml
index 7b460cd..11846b5 100755 (executable)
--- a/src/installer/resources/build.xml
+++ b/src/installer/resources/build.xml
@@ -7,7 +7,7 @@
     <property name="war.name" value="idp" />
 
     <!-- Installation specific property file -->
-    <property file="install.properties" />
+    <property file="${resources.dir}/install.properties" />
 
     <!-- Load ant-contrib tasks -->
     <taskdef resource="net/sf/antcontrib/antlib.xml" />
@@ -40,7 +40,7 @@
                 <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="install.properties">
+                <propertyfile file="${resources.dir}/install.properties">
                     <entry key="idp.home" value="${idp.home.input}" />
                     <entry key="idp.hostname" value="${idp.hostname.input}" />
                 </propertyfile>
@@ -68,7 +68,8 @@
                                 uriSubjectAltNames="${idp.entity.id}" />
 
                 <copy todir="${idp.home.path}/bin" preservelastmodified="true">
-                    <fileset dir="${tools.dir}" />
+                    <fileset dir="${tools.dir}/bash" />
+                    <fileset dir="${tools.dir}/bat" />
                     <filterset begintoken="$" endtoken="$">
                         <filter token="IDP_HOME" value="${idp.home.path}" />
                         <filter token="IDP_VERSION" value="${version}" />
@@ -105,9 +106,7 @@
         </if>
 
         <copy todir="${idp.home.path}/lib" preservelastmodified="true">
-            <fileset dir="${lib.dir}" />
-            <fileset file="${dist.dir}/${jar.name}" />
-            <fileset file="${build-lib.dir}/servlet-2.4.jar" />
+            <fileset dir="${basedir}/lib" />
         </copy>
 
         <copy todir="${idp.home.path}/lib/endorsed" preservelastmodified="true" failonerror="false">

diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties
index 0093564..30b5128 100644 (file)
--- a/src/installer/resources/install.properties
+++ b/src/installer/resources/install.properties
@@ -1,2 +1,2 @@
-idp.home = /opt/shibboleth-idp-${version}
+idp.home = /opt/shibboleth-idp
 idp.hostname=idp.example.org
\ No newline at end of file

diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index 6bb823b..efcb25e 100644 (file)
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -37,15 +37,7 @@
         </dependencySet>
     </dependencySets>
     
-    <fileSets>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-    
+    <fileSets>    
         <!-- Copy up our installer srcipts into the root of the package -->
         <fileSet>
             <directory>src/installer/bash</directory>
@@ -71,6 +63,10 @@
             <directory>src/main/webapp</directory>
             <outputDirectory>/src/main/webapp</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>src/tools</directory>
+            <outputDirectory>src/tools</outputDirectory>
+        </fileSet>
         
         <!-- Documentation -->
         <fileSet>