prepare_postgres and prepare_mysql targets are added to build.xml

diff --git a/Workspace/Siman-WS/build.xml b/Workspace/Siman-WS/build.xml
index 8b7b5c4e388f25f07d1d243e694bbfe8abd1cb82..de5a6540c5764c1e1da18c1f9cfa84bf6cd92ffc 100644 (file)
--- a/Workspace/Siman-WS/build.xml
+++ b/Workspace/Siman-WS/build.xml
@@ -22,7 +22,7 @@
        <!-- ================================================= -->
        <!--    siman-common: Build Siman-Common project           -->
        <!-- ================================================= -->
-<!--
+       <!--
        <target name="siman-common" description="Builds Siman-Common project">
                <ant dir="../${siman-common.project.name}" />
        </target>
@@ -102,4 +102,24 @@
                        <fileset dir="${siman-ws.dist.dir}" includes="**/*" />
                </delete>
        </target>
+
+       <!-- ================================================= -->
+       <!--    prepare-postgres: Prepare config for Postgress -->
+       <!-- ================================================= -->
+       <target name="prepare-postgres" description="prepare configuration for Postgress">
+               <echo message="Prepare configuration for Postgress..." />
+               <copy file="conf/debug_pg.properties" tofile="conf/debug.properties" overwrite="true"/>
+               <copy file="conf/release_pg.properties" tofile="conf/release.properties" overwrite="true"/>
+               <antcall target="debug-config"/>
+       </target>
+
+       <!-- ================================================= -->
+       <!--    prepare-postgres: Prepare config for MySql     -->
+       <!-- ================================================= -->
+       <target name="prepare-mysql" description="prepare configuration for MySql">
+               <echo message="Prepare configuration for MySql..." />
+               <copy file="conf/debug_mysql.properties" tofile="conf/debug.properties" overwrite="true"/>
+               <copy file="conf/release_mysql.properties" tofile="conf/release.properties" overwrite="true"/>
+               <antcall target="debug-config"/>
+       </target>
 </project>

diff --git a/Workspace/Siman-WS/conf/debug.properties b/Workspace/Siman-WS/conf/debug.properties
index 6ff257dc8e8eb0273ff3248d7cd11096af91038a..997c048b8bae6569d50f44e284fc6219cddc5b4b 100644 (file)
--- a/Workspace/Siman-WS/conf/debug.properties
+++ b/Workspace/Siman-WS/conf/debug.properties
@@ -3,7 +3,6 @@ connection.url=jdbc:mysql://localhost/simer
 connection.username=simer
 connection.password=admin
 connection.driver_class=com.mysql.jdbc.Driver
-#connection.driver_class=com.p6spy.engine.spy.P6SpyDriver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
@@ -26,7 +25,4 @@ org.apache.struts2.interceptor.validation.logger.level=DEBUG
 # Generated file header
 file.header=Don't edit manually. See the source in @config.src.dir@.
 
-wapp.root=D:/DevTools/SIMAN/SIMAN_SRC/Workspace/Siman-WS/WebContent/
-
-
 

diff --git a/Workspace/Siman-WS/conf/debug_mysql.properties b/Workspace/Siman-WS/conf/debug_mysql.properties
new file mode 100644 (file)
index 0000000..997c048
--- /dev/null
+++ b/Workspace/Siman-WS/conf/debug_mysql.properties
@@ -0,0 +1,28 @@
+# Connection properties
+connection.url=jdbc:mysql://localhost/simer
+connection.username=simer
+connection.password=admin
+connection.driver_class=com.mysql.jdbc.Driver
+
+# Hibernate config
+hibernate.hbm2ddl.auto=update
+hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
+hibernate.current_session_context_class=thread
+
+# Log properties
+hibernate.show_sql=true
+root.logger.appender=<appender-ref ref="console"/>
+root.logger.level=DEBUG
+com.opensymphony.logger.level=DEBUG
+org.apache.struts2.logger.level=DEBUG
+org.springframework.logger.level=DEBUG
+org.hibernate.logger.level=DEBUG
+org.splat.siman.logger.level=DEBUG
+log4j.logger.org.hibernate.logger.level=DEBUG
+com.opensymphony.xwork2.validator.logger.level=DEBUG
+org.apache.struts2.interceptor.validation.logger.level=DEBUG
+
+# Generated file header
+file.header=Don't edit manually. See the source in @config.src.dir@.
+
+

diff --git a/Workspace/Siman-WS/conf/debug_pg.properties b/Workspace/Siman-WS/conf/debug_pg.properties
index 87e1a87569d17b764d23f6c4365e916df2c335bd..e8466835f8eb437087faed838c20e5200f72d1fd 100644 (file)
--- a/Workspace/Siman-WS/conf/debug_pg.properties
+++ b/Workspace/Siman-WS/conf/debug_pg.properties
@@ -3,7 +3,6 @@ connection.url=jdbc:postgresql://localhost:5432/simer
 connection.username=simer
 connection.password=admin
 connection.driver_class=org.postgresql.Driver
-#connection.driver_class=com.p6spy.engine.spy.P6SpyDriver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
@@ -26,7 +25,4 @@ org.apache.struts2.interceptor.validation.logger.level=DEBUG
 # Generated file header
 file.header=Don't edit manually. See the source in @config.src.dir@.
 
-wapp.root=c:/work/SIMAN/SIMAN_SRC/Workspace/Siman/WebContent/
-
-
 

diff --git a/Workspace/Siman-WS/conf/release.properties b/Workspace/Siman-WS/conf/release.properties
index 39d7fbdd29e6cc39bd1395b2eef8f752097d4e2f..e849ecb95a394e5f27651baa9b24a4dd0f13f947 100644 (file)
--- a/Workspace/Siman-WS/conf/release.properties
+++ b/Workspace/Siman-WS/conf/release.properties
@@ -1,16 +1,13 @@
 # Connection properties
 connection.url=jdbc:mysql://localhost/simer
-#connection.url=jdbc:postgresql://localhost:5432/simer
 connection.username=simer
 connection.password=admin
 connection.driver_class=com.mysql.jdbc.Driver
-#connection.driver_class=org.postgresql.Driver
 
 # Hibernate config
-hibernate.hbm2ddl.auto=validate
-#hibernate.hbm2ddl.auto=update
+#hibernate.hbm2ddl.auto=validate
+hibernate.hbm2ddl.auto=update
 hibernate.dialect=org.hibernate.dialect.MySQLDialect
-#hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.current_session_context_class=thread
 
 # Log properties
@@ -26,5 +23,3 @@ log4j.logger.org.hibernate.logger.level=INFO
 
 # Generated file header
 file.header=================================
-
-wapp.root=D:/DevTools/SIMAN/SIMAN_SRC/Workspace/Siman-WS/WebContent/

diff --git a/Workspace/Siman-WS/conf/release_mysql.properties b/Workspace/Siman-WS/conf/release_mysql.properties
new file mode 100644 (file)
index 0000000..e849ecb
--- /dev/null
+++ b/Workspace/Siman-WS/conf/release_mysql.properties
@@ -0,0 +1,25 @@
+# Connection properties
+connection.url=jdbc:mysql://localhost/simer
+connection.username=simer
+connection.password=admin
+connection.driver_class=com.mysql.jdbc.Driver
+
+# Hibernate config
+#hibernate.hbm2ddl.auto=validate
+hibernate.hbm2ddl.auto=update
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
+hibernate.current_session_context_class=thread
+
+# Log properties
+hibernate.show_sql=false
+root.logger.appender=
+root.logger.level=INFO
+com.opensymphony.logger.level=INFO
+org.apache.struts2.logger.level=INFO
+org.springframework.logger.level=INFO
+org.hibernate.logger.level=INFO
+org.splat.siman.logger.level=INFO
+log4j.logger.org.hibernate.logger.level=INFO
+
+# Generated file header
+file.header=================================

diff --git a/Workspace/Siman-WS/conf/release_pg.properties b/Workspace/Siman-WS/conf/release_pg.properties
new file mode 100644 (file)
index 0000000..88555e3
--- /dev/null
+++ b/Workspace/Siman-WS/conf/release_pg.properties
@@ -0,0 +1,25 @@
+# Connection properties
+connection.url=jdbc:postgresql://localhost:5432/simer
+connection.username=simer
+connection.password=admin
+connection.driver_class=org.postgresql.Driver
+
+# Hibernate config
+#hibernate.hbm2ddl.auto=validate
+hibernate.hbm2ddl.auto=update
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.current_session_context_class=thread
+
+# Log properties
+hibernate.show_sql=false
+root.logger.appender=
+root.logger.level=INFO
+com.opensymphony.logger.level=INFO
+org.apache.struts2.logger.level=INFO
+org.springframework.logger.level=INFO
+org.hibernate.logger.level=INFO
+org.splat.siman.logger.level=INFO
+log4j.logger.org.hibernate.logger.level=INFO
+
+# Generated file header
+file.header=================================