Scarab commit: svn commit: r11312 - trunk: . extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build

Author: jhoech
Date: 2012-10-24 08:08:36-0700
New Revision: 11312

Modified:
   trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
   trunk/minimal.properties
   trunk/pom.xml
   trunk/project.properties
   trunk/scarab_properties.xml
   trunk/wizzard.properties

Log:
ENH - Result for scarab.database.type=**generated** is scarab.database.type=hypersonic.

Modified: trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/PropertyFileGenerator.java?view=diff&pathrev=11312&r1=11311&r2=11312
==============================================================================
--- trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/PropertyFileGenerator.java	(original)
+++ trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/PropertyFileGenerator.java	2012-10-24 08:08:36-0700
@@ -421,11 +421,13 @@
         else if(newValue.equalsIgnoreCase("**generated**"))
         {
             String dbtype = (String)userProperties.get("scarab.database.type");
-            if(dbtype.equals(""))
+            if(dbtype.equalsIgnoreCase("**generated**"))
             {
                 dbtype="hypersonic";
             }
+
             newValue = "${"+propertyName+"."+dbtype+"}";
+            
         }
 
         if ( newValue.equals(templateValue))

Modified: trunk/minimal.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/minimal.properties?view=diff&pathrev=11312&r1=11311&r2=11312
==============================================================================
--- trunk/minimal.properties	(original)
+++ trunk/minimal.properties	2012-10-24 08:08:36-0700
@@ -72,7 +72,7 @@
 #  -----              
 # 
 
-scarab.database.type=hypersonic
+scarab.database.type=**GENERATED**
 
 
 # ============================

Modified: trunk/pom.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/pom.xml?view=diff&pathrev=11312&r1=11311&r2=11312
==============================================================================
--- trunk/pom.xml	(original)
+++ trunk/pom.xml	2012-10-24 08:08:36-0700
@@ -320,7 +320,7 @@
 		  <plugin>
 			<groupId>org.tigris.scarab</groupId>
 			<artifactId>scarab-maven-plugin</artifactId>
-			<version>1.0</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<configuration>
 				<dbType>${scarab.database.type}</dbType>
 				<dbUser>${scarab.database.admin.username}</dbUser>

Modified: trunk/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.properties?view=diff&pathrev=11312&r1=11311&r2=11312
==============================================================================
--- trunk/project.properties	(original)
+++ trunk/project.properties	2012-10-24 08:08:36-0700
@@ -150,7 +150,7 @@
 #  -----              
 # 
 
-scarab.database.type=hypersonic
+scarab.database.type=**GENERATED**
 
 
 # ============================
@@ -1939,6 +1939,7 @@
 #
 #   hsqldb.database
 #   hsqldb.dbname
+#   scarab.database.type.hypersonic
 #   scarab.jdbc.handler.hypersonic
 #   scarab.database.port.hypersonic
 #   scarab.database.admin.url.hypersonic
@@ -1961,6 +1962,7 @@
 
 hsqldb.database=hsqldb
 hsqldb.dbname=${scarab.database.name}
+scarab.database.type.hypersonic=hypersonic
 scarab.jdbc.handler.hypersonic=hsqldb
 scarab.database.port.hypersonic=3306
 scarab.database.admin.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/embedded_hsqldb/${hsqldb.dbname};shutdown=true

Modified: trunk/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/scarab_properties.xml?view=diff&pathrev=11312&r1=11311&r2=11312
==============================================================================
--- trunk/scarab_properties.xml	(original)
+++ trunk/scarab_properties.xml	2012-10-24 08:08:36-0700
@@ -194,7 +194,7 @@
 
     <property>
       <name>scarab.database.type</name>
-      <default>hypersonic</default>
+      <default>**GENERATED**</default>
       <type>Build</type>
        <customization modification="optional">basic</customization>
       <file/>
@@ -2098,6 +2098,13 @@
          <customization modification="optional">basic</customization>
         <file/>
       </property>
+	  <property>
+        <name>scarab.database.type.hypersonic</name>
+        <default>hypersonic</default>
+        <type>Runtime</type>
+         <customization modification="optional">basic</customization>
+        <file/>
+      </property>
       <property>
         <name>scarab.jdbc.handler.hypersonic</name>
         <default>hsqldb</default>

Modified: trunk/wizzard.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/wizzard.properties?view=diff&pathrev=11312&r1=11311&r2=11312
==============================================================================
--- trunk/wizzard.properties	(original)
+++ trunk/wizzard.properties	2012-10-24 08:08:36-0700
@@ -185,6 +185,7 @@
 #
 #   hsqldb.database
 #   hsqldb.dbname
+#   scarab.database.type.hypersonic
 #   scarab.jdbc.handler.hypersonic
 #   scarab.database.port.hypersonic
 #   scarab.database.admin.url.hypersonic
@@ -207,6 +208,7 @@
 
 hsqldb.database=hsqldb
 hsqldb.dbname=${scarab.database.name}
+scarab.database.type.hypersonic=hypersonic
 scarab.jdbc.handler.hypersonic=hsqldb
 scarab.database.port.hypersonic=3306
 scarab.database.admin.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/embedded_hsqldb/${hsqldb.dbname};shutdown=true

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=3023207