portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1178776 - in /portals/jetspeed-2/portal/trunk/jetspeed-installer/etc: ant-installer/build.xml database/build.xml database/database.properties.template
Date Tue, 04 Oct 2011 13:34:36 GMT
Author: ate
Date: Tue Oct  4 13:34:36 2011
New Revision: 1178776

URL: http://svn.apache.org/viewvc?rev=1178776&view=rev
Log:
Fixing JS2-1265: Jetspeed demo installation fails to re-initialize the database from the command
line 

Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml?rev=1178776&r1=1178775&r2=1178776&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml Tue Oct
 4 13:34:36 2011
@@ -66,6 +66,8 @@
         <filter token="jdbc.url" value="${jdbc.url}" />
         <filter token="jdbc.driver.class" value="${jdbc.driver.class}" />
         <filter token="dbImportPsml" value="${dbImportPsml}" />
+        <filter token="installation.type" value="${installationType}" />
+        <filter token="installation.ui" value="${pipelineType}" />
       </filterset>
     </move>
 

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml?rev=1178776&r1=1178775&r2=1178776&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml Tue Oct  4 13:34:36
2011
@@ -345,26 +345,26 @@
         <echo>Seeding the database</echo>
         <condition property="_seedDataFile" value="j2-ui-seed.xml">
           <and>
-            <equals arg1="${installationType}" arg2="demo" />
-            <equals arg1="${pipelineType}" arg2="jetui" />
+            <equals arg1="${installation.type}" arg2="demo" />
+            <equals arg1="${installation.ui}" arg2="jetui" />
           </and>
         </condition>
         <condition property="_seedDataFile" value="j2-seed.xml">
           <and>
-            <equals arg1="${installationType}" arg2="demo" />
-            <equals arg1="${pipelineType}" arg2="classic" />
+            <equals arg1="${installation.type}" arg2="demo" />
+            <equals arg1="${installation.ui}" arg2="classic" />
           </and>
         </condition>
         <condition property="_seedDataFile" value="min/j2-ui-seed.xml">
           <and>
-            <equals arg1="${installationType}" arg2="minimal" />
-            <equals arg1="${pipelineType}" arg2="jetui" />
+            <equals arg1="${installation.type}" arg2="minimal" />
+            <equals arg1="${installation.ui}" arg2="jetui" />
           </and>
         </condition>
         <condition property="_seedDataFile" value="min/j2-seed.xml">
           <and>
-            <equals arg1="${installationType}" arg2="minimal" />
-            <equals arg1="${pipelineType}" arg2="classic" />
+            <equals arg1="${installation.type}" arg2="minimal" />
+            <equals arg1="${installation.ui}" arg2="classic" />
           </and>
         </condition>
         <echo>Importing: ${_seedDataFile}</echo>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template?rev=1178776&r1=1178775&r2=1178776&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
Tue Oct  4 13:34:36 2011
@@ -26,3 +26,5 @@ jdbc.driver.class=@jdbc.driver.class@
 
 ; boolean flag (true/false) indicating if psml is to be imported in the database or will
be read from file system
 dbImportPsml = @dbImportPsml@
+installation.type = @installation.type@
+installation.ui = @installation.ui@



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message