Moved installation dir to /opt.

rgorosito · Nov 18, 2008 · ff75494 · ff75494
1 parent f8a6d70
commit ff75494
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 72 deletions.
diff --git a/client/build.xml b/client/build.xml
@@ -12,7 +12,7 @@
     <property name="module.name" value="penrose-client"/>
 
     <property name="prefix" value=""/>
-    <property name="install.dir" value="${prefix}/usr/local/${module.name}-${product.version}"/>
+    <property name="client.home" value="${prefix}/opt/${module.name}-${product.version}"/>
     <property name="docs.target" value="dist/javadoc"/>
 
     <tstamp>
@@ -349,37 +349,37 @@
     </target>
 
     <target name="pre-install">
-        <mkdir dir="${install.dir}"/>
+        <mkdir dir="${client.home}"/>
         <condition property="conf.missing">
           <not>
-            <available file="${install.dir}/conf/log4j.xml"/>
+            <available file="${client.home}/conf/log4j.xml"/>
           </not>
         </condition>
     </target>
 
     <target name="copy-penrose-conf" if="conf.missing">
-        <copy todir="${install.dir}">
+        <copy todir="${client.home}">
             <fileset dir="target/dist">
                 <include name="conf/**/*"/>
             </fileset>
         </copy>
     </target>
 
     <target name="install" depends="init,pre-install,copy-penrose-conf">
-        <mkdir dir="${install.dir}"/>
+        <mkdir dir="${client.home}"/>
         <delete failonerror="false">
-            <fileset dir="${install.dir}">
+            <fileset dir="${client.home}">
                 <include name="lib/*"/>
             </fileset>
         </delete>
-        <copy todir="${install.dir}">
+        <copy todir="${client.home}">
             <fileset dir="target/dist">
                 <include name="**/*"/>
                 <exclude name="conf/**/*"/>
             </fileset>
         </copy>
-        <chmod dir="${install.dir}" perm="ugo+rw" includes="**/*"/>
-        <chmod dir="${install.dir}" perm="ugo+rx" includes="**/*.sh"/>
+        <chmod dir="${client.home}" perm="ugo+rw" includes="**/*"/>
+        <chmod dir="${client.home}" perm="ugo+rx" includes="**/*.sh"/>
     </target>
 
     <target name="clean">

diff --git a/core/build.xml b/core/build.xml
@@ -11,7 +11,6 @@
 
     <property name="project.dist" value="../dist"/>
 
-    <property name="penrose.home" value="${prefix}/usr/local/${product.name}-${product.version}"/>
     <property name="docs.target" value="${project.dist}/javadoc"/>
 
     <tstamp>

diff --git a/monitors/JMX/build.xml b/monitors/JMX/build.xml
@@ -14,8 +14,6 @@
     <property name="monitor.title" value="JMX"/>
     <property name="monitor.dir" value="monitors/${monitor.title}"/>
 
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
-
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>
     </tstamp>
@@ -97,13 +95,13 @@
     <target name="check-install">
         <condition property="config.missing">
           <not>
-            <available file="${penrose.home}/${monitor.dir}/MONITOR-INF/monitor.xml"/>
+            <available file="${server.home}/${monitor.dir}/MONITOR-INF/monitor.xml"/>
           </not>
         </condition>
     </target>
 
     <target name="install-config" if="config.missing">
-        <copy todir="${penrose.home}/${monitor.dir}">
+        <copy todir="${server.home}/${monitor.dir}">
             <fileset dir="../../server/target/dist/${monitor.dir}">
                 <include name="MONITOR-INF/monitor.xml"/>
             </fileset>
@@ -114,7 +112,7 @@
     </target>
 
     <target name="install" depends="init,check-install,install-config">
-        <copy todir="${penrose.home}/${monitor.dir}" overwrite="true">
+        <copy todir="${server.home}/${monitor.dir}" overwrite="true">
             <fileset dir="../../server/target/dist/${monitor.dir}">
                 <exclude name="MONITOR-INF/monitor.xml"/>
             </fileset>

diff --git a/monitors/LDAP/build.xml b/monitors/LDAP/build.xml
@@ -10,8 +10,6 @@
     <property name="monitor.title" value="LDAP"/>
     <property name="monitor.dir" value="monitors/${monitor.title}"/>
 
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
-
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>
     </tstamp>
@@ -93,13 +91,13 @@
     <target name="check-install">
         <condition property="config.missing">
           <not>
-            <available file="${penrose.home}/${monitor.dir}/MONITOR-INF/monitor.xml"/>
+            <available file="${server.home}/${monitor.dir}/MONITOR-INF/monitor.xml"/>
           </not>
         </condition>
     </target>
 
     <target name="install-config" if="config.missing">
-        <copy todir="${penrose.home}/${monitor.dir}">
+        <copy todir="${server.home}/${monitor.dir}">
             <fileset dir="../../server/target/dist/${monitor.dir}">
                 <include name="MONITOR-INF/monitor.xml"/>
             </fileset>
@@ -110,7 +108,7 @@
     </target>
 
     <target name="install" depends="init,check-install,install-config">
-        <copy todir="${penrose.home}/${monitor.dir}" overwrite="true">
+        <copy todir="${server.home}/${monitor.dir}" overwrite="true">
             <fileset dir="../../server/target/dist/${monitor.dir}">
                 <exclude name="MONITOR-INF/monitor.xml"/>
             </fileset>

diff --git a/monitors/build.xml b/monitors/build.xml
@@ -5,7 +5,6 @@
     <property file="../build.properties"/>
 
     <property name="prefix" value=""/>
-    <property name="penrose.home" value="${prefix}/usr/local/${product.name}-server-${product.version}"/>
 
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>

diff --git a/samples/ad_sync/build.xml b/samples/ad_sync/build.xml
@@ -9,7 +9,6 @@
     <property file="../../build.properties"/>
 
     <property name="prefix" value=""/>
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
 
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>

diff --git a/samples/build.xml b/samples/build.xml
@@ -9,7 +9,6 @@
     <property file="../build.properties"/>
 
     <property name="prefix" value=""/>
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
 
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>
@@ -70,7 +69,7 @@
     </target>
 
     <target name="install" depends="init">
-        <copy todir="${penrose.home}/samples" overwrite="true">
+        <copy todir="${server.home}/samples" overwrite="true">
             <fileset dir="../server/target/dist/samples"/>
         </copy>
     </target>

diff --git a/samples/changelog/build.xml b/samples/changelog/build.xml
@@ -9,7 +9,6 @@
     <property file="../../build.properties"/>
 
     <property name="prefix" value=""/>
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
 
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>

diff --git a/samples/federation/build.xml b/samples/federation/build.xml
@@ -9,7 +9,6 @@
     <property file="../../build.properties"/>
 
     <property name="prefix" value=""/>
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
 
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>

diff --git a/samples/jboss/build.xml b/samples/jboss/build.xml
@@ -4,7 +4,6 @@
 -->
 <project name="penrose-jboss" default="build" basedir="../..">
 
-    <property name="penrose.home" value="${basedir}"/>
     <property name="jboss.home" value="/usr/local/jboss"/>
     <property name="jboss.server" value="default"/>
     <property name="jboss.deploy" value="${jboss.home}/server/${jboss.server}/deploy"/>

diff --git a/samples/jdbc_sync/build.xml b/samples/jdbc_sync/build.xml
@@ -9,7 +9,6 @@
     <property file="../../build.properties"/>
 
     <property name="prefix" value=""/>
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
 
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>

diff --git a/samples/ldap_sync/build.xml b/samples/ldap_sync/build.xml
@@ -9,7 +9,6 @@
     <property file="../../build.properties"/>
 
     <property name="prefix" value=""/>
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
 
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>

diff --git a/samples/lockout/build.xml b/samples/lockout/build.xml
@@ -9,7 +9,6 @@
     <property file="../../build.properties"/>
 
     <property name="prefix" value=""/>
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
 
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>

diff --git a/samples/tomcat/WEB-INF/web.xml b/samples/tomcat/WEB-INF/web.xml
@@ -11,7 +11,7 @@
         <servlet-class>org.safehaus.penrose.example.tomcat.DemoServlet</servlet-class>
         <init-param>
             <param-name>penrose.home</param-name>
-            <param-value>${penrose.home}</param-value>
+            <param-value>${penrose.server.home}</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>

diff --git a/samples/tomcat/build.xml b/samples/tomcat/build.xml
@@ -4,7 +4,6 @@
 -->
 <project name="penrose-tomcat" default="build" basedir="../..">
 
-    <property name="penrose.home" value="${basedir}"/>
     <property name="tomcat.home" value="/usr/local/tomcat"/>
     <property name="webapp.name" value="penrose"/>
     <property name="webapp.dir" value="${tomcat.home}/webapps/${webapp.name}"/>

diff --git a/server/build.xml b/server/build.xml
@@ -12,7 +12,8 @@
     <property name="module.name" value="${product.name}-server"/>
     <property name="project.dist" value="dist"/>
 
-    <property name="penrose.home" value="${prefix}/usr/local/${module.name}-${product.version}"/>
+    <property name="server.home" value="${prefix}/opt/${module.name}-${product.version}"/>
+
     <property name="docs.target" value="dist/javadoc"/>
 
     <tstamp>
@@ -441,25 +442,25 @@
     </target>
 
     <target name="check-install">
-        <mkdir dir="${penrose.home}"/>
+        <mkdir dir="${server.home}"/>
         <condition property="penrose.conf.missing">
           <not>
-            <available file="${penrose.home}/conf/server.xml"/>
+            <available file="${server.home}/conf/server.xml"/>
           </not>
         </condition>
     </target>
 
     <target name="install-conf" if="penrose.conf.missing">
         <echo message="Installing configuration files."/>
-        <copy todir="${penrose.home}">
+        <copy todir="${server.home}">
             <fileset dir="target/dist">
                 <include name="conf/**/*"/>
             </fileset>
         </copy>
     </target>
 
     <target name="install" depends="init,check-install,install-conf">
-        <copy todir="${penrose.home}" overwrite="true">
+        <copy todir="${server.home}" overwrite="true">
             <fileset dir="target/dist">
                 <exclude name="conf/**/*"/>
                 <exclude name="samples/**/*"/>
@@ -470,12 +471,12 @@
             </fileset>
         </copy>
         <delete failonerror="true">
-            <fileset dir="${penrose.home}">
+            <fileset dir="${server.home}">
                 <include name="lib/*"/>
                 <include name="server/lib/*"/>
             </fileset>
         </delete>
-        <copy todir="${penrose.home}" overwrite="true">
+        <copy todir="${server.home}" overwrite="true">
             <fileset dir="target/dist">
                 <include name="lib/*"/>
                 <include name="server/lib/*"/>
@@ -484,19 +485,19 @@
         <ant dir="../monitors" target="install"/>
         <ant dir="../services" target="install"/>
         <ant dir="../samples" target="install"/>
-        <chmod dir="${penrose.home}" perm="ugo+rw" includes="**/*"/>
-        <chmod dir="${penrose.home}" perm="ugo+rx" includes="**/*.sh"/>
+        <chmod dir="${server.home}" perm="ugo+rw" includes="**/*"/>
+        <chmod dir="${server.home}" perm="ugo+rx" includes="**/*.sh"/>
     </target>
 
     <target name="uninstall" depends="init">
         <delete failonerror="false" includeemptydirs="true">
-            <fileset dir="${penrose.home}/bin" includes="**/*"/>
-            <fileset dir="${penrose.home}/conf/default" includes="*"/>
-            <fileset dir="${penrose.home}/docs" includes="**/*"/>
-            <fileset dir="${penrose.home}/lib" includes="*"/>
-            <fileset dir="${penrose.home}/samples" includes="**/*"/>
-            <fileset dir="${penrose.home}/schema" includes="**/*"/>
-            <fileset dir="${penrose.home}" includes="*"/>
+            <fileset dir="${server.home}/bin" includes="**/*"/>
+            <fileset dir="${server.home}/conf/default" includes="*"/>
+            <fileset dir="${server.home}/docs" includes="**/*"/>
+            <fileset dir="${server.home}/lib" includes="*"/>
+            <fileset dir="${server.home}/samples" includes="**/*"/>
+            <fileset dir="${server.home}/schema" includes="**/*"/>
+            <fileset dir="${server.home}" includes="*"/>
         </delete>
     </target>
 

diff --git a/services/ApacheDS/build.xml b/services/ApacheDS/build.xml
@@ -14,8 +14,6 @@
     <property name="service.title" value="ApacheDS"/>
     <property name="service.dir" value="services/${service.title}"/>
 
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
-
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>
     </tstamp>
@@ -103,13 +101,13 @@
     <target name="check-install">
         <condition property="config.missing">
           <not>
-            <available file="${penrose.home}/${service.dir}/SERVICE-INF/service.xml"/>
+            <available file="${server.home}/${service.dir}/SERVICE-INF/service.xml"/>
           </not>
         </condition>
     </target>
 
     <target name="install-config" if="config.missing">
-        <copy todir="${penrose.home}/${service.dir}">
+        <copy todir="${server.home}/${service.dir}">
             <fileset dir="../../server/target/dist/${service.dir}">
                 <include name="SERVICE-INF/service.xml"/>
             </fileset>
@@ -120,7 +118,7 @@
     </target>
 
     <target name="install" depends="init,check-install,install-config">
-        <copy todir="${penrose.home}/${service.dir}" overwrite="true">
+        <copy todir="${server.home}/${service.dir}" overwrite="true">
             <fileset dir="../../server/target/dist/${service.dir}">
                 <exclude name="SERVICE-INF/service.xml"/>
             </fileset>

diff --git a/services/ApacheDS/conf/server.xml b/services/ApacheDS/conf/server.xml
@@ -6,7 +6,7 @@
 <beans>
 
   <bean id="penroseServer" class="org.safehaus.penrose.server.PenroseServer">
-    <constructor-arg><value>${penrose.home}</value></constructor-arg>
+    <constructor-arg><value>${penrose.server.home}</value></constructor-arg>
   </bean>
 
   <bean id="penroseInterceptor" class="org.safehaus.penrose.ldapbackend.apacheds.LDAPBackendInterceptor">

diff --git a/services/JMX/build.xml b/services/JMX/build.xml
@@ -14,8 +14,6 @@
     <property name="service.title" value="JMX"/>
     <property name="service.dir" value="services/${service.title}"/>
 
-    <property name="penrose.home" value="${prefix}/usr/local/penrose-server-${product.version}"/>
-
     <tstamp>
         <format property="TIMESTAMP" pattern="yyyyMMddHHmmss"/>
     </tstamp>
@@ -101,13 +99,13 @@
     <target name="check-install">
         <condition property="config.missing">
           <not>
-            <available file="${penrose.home}/${service.dir}/SERVICE-INF/service.xml"/>
+            <available file="${server.home}/${service.dir}/SERVICE-INF/service.xml"/>
           </not>
         </condition>
     </target>
 
     <target name="install-config" if="config.missing">
-        <copy todir="${penrose.home}/${service.dir}">
+        <copy todir="${server.home}/${service.dir}">
             <fileset dir="../../server/target/dist/${service.dir}">
                 <include name="SERVICE-INF/service.xml"/>
             </fileset>
@@ -118,7 +116,7 @@
     </target>
 
     <target name="install" depends="init,check-install,install-config">
-        <copy todir="${penrose.home}/${service.dir}" overwrite="true">
+        <copy todir="${server.home}/${service.dir}" overwrite="true">
             <fileset dir="../../server/target/dist/${service.dir}">
                 <exclude name="SERVICE-INF/service.xml"/>
             </fileset>