[jbpm-commits] JBoss JBPM SVN: r5833 - jbpm4/trunk/modules/distro/src/main/files/install.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-10-28 11:15:56 -0400 (Wed, 28 Oct 2009)
New Revision: 5833

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
moved creation of jbpm security domain configuration in conf/server.xml into target install.jbpm.into.tomcat

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-10-28 15:12:50 UTC (rev 5832)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-10-28 15:15:56 UTC (rev 5833)
@@ -373,7 +373,7 @@
         <antcall target="internal.install.and.start.hsqldb.if.needed" />
         <antcall target="create.jbpm.schema" /> 
         <antcall target="install.examples.into.tomcat" />
-        <antcall target="install.example.identities.into.tomcat" />
+        <antcall target="load.example.identities" />
         <antcall target="start.tomcat" />
         <antcall target="install.eclipse" />
         <antcall target="start.eclipse" />
@@ -496,7 +496,13 @@
     <!-- copy database driver -->
     <property name="database.driver.destination.dir" value="${tomcat.home}/lib" />
     <antcall target="internal.copy.database.driver" />
-    
+  	
+    <!-- tweak the tomcat server config for the security domain -->
+    <copy file="${install.src.dir}/tomcat/server.xml"
+          tofile="${tomcat.home}/conf/server.xml" 
+          overwrite="true">
+          <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
+    </copy>
   </target>
   
   <!-- ### INSTALL EXAMPLES INTO TOMCAT ################################################ -->  
@@ -661,15 +667,6 @@
     </sql>
   </target>
   
-  <!-- ### INSTALL EXAMPLE IDENTITIES INTO TOMCAT ######################################## -->
-  <target name="install.example.identities.into.tomcat" depends="load.example.identities">
-    <copy file="${install.src.dir}/tomcat/server.xml"
-          tofile="${tomcat.home}/conf/server.xml" 
-          overwrite="true">
-          <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
-     </copy>
-  </target>
-
   <!-- ### START HSQLDB DATABASE MGR ##################################### -->
   <target name="hsqldb.databasemanager"
           description="start the hsqldb database manager">