[ http://jira.andromda.org/browse/ANDROMDAPP-20?page=comments#action_12943
]
Pierre Colot commented on ANDROMDAPP-20:
----------------------------------------
Resumit in diff -u format with upgrade from hibernate 3.0.x to 3.1.x
---
R:\PCOLOT\andromda-src-3.2-SNAPSHOT-20060514\andromdapp\projects\j2ee\maven2\src\main\resources\META-INF\andromdapp\andromdapp.xml
Wed Jun 28 09:52:19 2006
+++
R:\PCOLOT\ref-andromda-src-3.2-SNAPSHOT-20060514\andromda-src-3.2-SNAPSHOT\andromdapp\projects\j2ee\maven2\src\main\resources\META-INF\andromdapp\andromdapp.xml
Sun May 14 21:42:32 2006
@@ -117,16 +117,6 @@
<documentation>
Provides the choice of components with the application.
</documentation>
- <prompt id="tomcatVersion">
- <text>Would you like to use Tomcat 5.0.x or Tomcat 5.5.x
(enter '0' for 5.0.x or '5' for 5.5.x)?</text>
- <preconditions>
- <condition id="applicationType" equal="war"/>
- </preconditions>
- <responses>
- <response>0</response>
- <response>5</response>
- </responses>
- </prompt>
<prompt id="transactionPersistenceType" setResponseAsTrue="true">
<text>Please enter the type of transactional/persistence
cartridge to use</text>
<responses>
@@ -157,109 +147,6 @@
<response>derby</response>
</responses>
</prompt>
- <prompt id="dbDialect">
- <text>Please enter the MySql Dialect (enter 'none' or 'InnoDB'
or 'MyISAM')</text>
- <preconditions>
- <condition id="databaseType" equal="mysql"/>
- </preconditions>
- <responses>
- <response>none</response>
- <response>InnoDB</response>
- <response>MyISAM</response>
- </responses>
- </prompt>
- <prompt id="dbDialect">
- <text>Please enter the Oracle Dialect (enter 'none' or
'9')</text>
- <preconditions>
- <condition id="databaseType" equal="oracle"/>
- </preconditions>
- <responses>
- <response>none</response>
- <response>9</response>
- </responses>
- </prompt>
- <prompt id="dbDialect">
- <text>Please enter the Oracle SyBase (enter 'none'or
'AnyWhere')</text>
- <preconditions>
- <condition id="databaseType" equal="sybase"/>
- </preconditions>
- <responses>
- <response>none</response>
- <response>Anywhere</response>
- </responses>
- </prompt>
- <prompt id="jdbcDriverJarName">
- <text>Please enter the jdbc driver jar name (i.e.
'jdbc-mysql.jar')</text>
- <preconditions>
- <condition id="databaseType" equal="mysql"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcDriverJarName">
- <text>Please enter the jdbc driver jar name (i.e. For
Hypersonic use: 'hsqldb.jar')</text>
- <preconditions>
- <condition id="databaseType" notEqual="mysql"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcServerName">
- <text>Please enter the database server name (i.e.
'localhost')</text>
- <preconditions>
- <condition id="transactionPersistenceType"
notEqual="none"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcPortNumber">
- <text>Please enter the database port number (i.e.
'3306')</text>
- <preconditions>
- <condition id="databaseType" equal="mysql"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcPortNumber">
- <text>Please enter the database port number (i.e.
'1521')</text>
- <preconditions>
- <condition id="databaseType" equal="oracle"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcPortNumber">
- <text>Please enter the database port number (i.e.
'1557')</text>
- <preconditions>
- <condition id="databaseType" equal="informix"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcPortNumber">
- <text>Please enter the database port number (i.e.
'1433')</text>
- <preconditions>
- <condition id="databaseType" equal="mssql"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcPortNumber">
- <text>Please enter the database port number (i.e.
'5000')</text>
- <preconditions>
- <condition id="databaseType" equal="sybase"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcPortNumber">
- <text>Please enter the database port number (i.e.
'3305')</text>
- <preconditions>
- <condition id="databaseType" equal="progress"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcPortNumber">
- <text>Please enter the database port number (i.e.
'1701')</text>
- <preconditions>
- <condition id="databaseType" equal="hypersonic"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcUsername">
- <text>Please enter the username to connect to the database
(i.e. 'none' or i.e. 'SA')</text>
- <preconditions>
- <condition id="transactionPersistenceType"
notEqual="none"/>
- </preconditions>
- </prompt>
- <prompt id="jdbcPassword">
- <text>Please enter the password to connect to the database
(i.e. 'none' or i.e. 'MyPassword')</text>
- <preconditions>
- <condition id="transactionPersistenceType"
notEqual="none"/>
- </preconditions>
- </prompt>
<prompt id="workflow">
<text>Will your project need workflow engine capabilities? (it
uses jBPM and Hibernate3)?</text>
<responses type="java.lang.Boolean">
@@ -273,7 +160,7 @@
</conditions>
</prompt>
<prompt id="hibernateVersion">
- <text>Please enter the hibernate version number (enter '2' for
2.1.x or '3' for 3.1.x)</text>
+ <text>Please enter the hibernate version number (enter '2' for
2.1.x or '3' for 3.0.x)</text>
<preconditions type="or">
<condition id="transactionPersistenceType" equal="spring"/>
<condition id="transactionPersistenceType"
equal="hibernate"/>
---
R:\PCOLOT\andromda-src-3.2-SNAPSHOT-20060514\andromdapp\projects\j2ee\maven2\src\main\resources\templates\j2ee\maven2\pom.xml.vsl
Wed Jun 28 09:44:56 2006
+++
R:\PCOLOT\ref-andromda-src-3.2-SNAPSHOT-20060514\andromda-src-3.2-SNAPSHOT\andromdapp\projects\j2ee\maven2\src\main\resources\templates\j2ee\maven2\pom.xml.vsl
Sun May 14 21:42:32 2006
@@ -323,7 +323,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
- <version>3.1.1</version>
+ <version>3.0.5</version>
</dependency>
#end
<dependency>
@@ -343,14 +343,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>1.2.7</version>
-#if ($ear)
<exclusions>
<exclusion>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</exclusion>
</exclusions>
-#end
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -880,17 +878,9 @@
-->
<hibernate.dialect>
#if ($mysql)
-#if ($dbDialect == "none")
- org.hibernate.dialect.MySQLDialect
-#else
- org.hibernate.dialect.MySQL${dbDialect}Dialect
-#end
+ org.hibernate.dialect.MySQLInnoDBDialect
#elseif ($oracle)
-#if ($dbDialect == "none")
- org.hibernate.dialect.OracleDialect
-#else
- org.hibernate.dialect.Oracle${dbDialect}Dialect
-#end
+ org.hibernate.dialect.Oracle9Dialect
#elseif ($db2)
org.hibernate.dialect.DB2Dialect
#elseif ($informix)
@@ -902,11 +892,7 @@
#elseif ($postgres)
org.hibernate.dialect.PostgreSQLDialect
#elseif ($sybase)
-#if ($dbDialect == "none")
org.hibernate.dialect.SybaseDialect
-#else
- org.hibernate.dialect.Sybase${dbDialect}Dialect
-#end
#elseif ($sapdb)
org.hibernate.dialect.SAPDBDialect
#elseif ($progress)
@@ -991,11 +977,10 @@
For Hypersonic use: hsqldb.jar
-->
#if ($ear)
-
<jdbc.driver.jar>${jboss.home}/server/default/lib/$jdbcDriverJarName</jdbc.driver.jar>
+
<jdbc.driver.jar>${jboss.home}/server/default/lib/hsqldb.jar</jdbc.driver.jar>
#else
-
<jdbc.driver.jar>${tomcat.home}/common/lib/$jdbcDriverJarName</jdbc.driver.jar>
+ <jdbc.driver.jar>/path/to/hsqldb/hsqldb.jar</jdbc.driver.jar>
#end
-
<!--
Change driver for appropriate database
For MySQL use: com.mysql.jdbc.Driver
@@ -1041,6 +1026,7 @@
<!--
Change connection url for appropriate database
For MySQL use: jdbc:mysql://localhost:3306/$applicationId
+ For Hypersonic use: jdbc:hsqldb:hsql://127.0.0.1:1701
For Oracle9i use: jdbc:oracle:thin:@localhost:1521:yoursid
For DB2 use: jdbc:db2:$applicationId
For Informix use:
jdbc:informix-sqli://localhost:1557/${applicationId}:INFORMIXSERVER=myserver
@@ -1050,46 +1036,36 @@
For Sybase use:
jdbc:sybase:Tds:localhost:5000/${applicationId}?JCONNECT_VERSION=6
For SapDB use: jdbc:sapdb://127.0.0.1/$applicationId
For Progress use:
jdbc:JdbcProgress:T:localhost:3305:$applicationId
- For Derby use: jdbc:derby:$applicationId
- For Hypersonic use: jdbc:hsqldb:hsql://127.0.0.1:1701
-->
<jdbc.url>
#if ($mysql)
-
jdbc:mysql://${jdbcServerName}:${jdbcPortNumber}/$applicationId.replace('-',
'_')
+ jdbc:mysql://localhost:3306/$applicationId
#elseif ($oracle)
- jdbc:oracle:thin:@$jdbcServerName:$jdbcPortNumber:yoursid
+ jdbc:oracle:thin:@localhost:1521:yoursid
#elseif ($db2)
jdbc:db2:$applicationId
#elseif ($informix)
-
jdbc:informix-sqli://$jdbcServerName:$jdbcPortNumber/${applicationId}:INFORMIXSERVER=myserver
+
jdbc:informix-sqli://localhost:1557/${applicationId}:INFORMIXSERVER=myserver
#elseif ($mssql)
-
jdbc:microsoft:sqlserver://$jdbcServerName:$jdbcPortNumber;DatabaseName=$applicationId
+
jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=$applicationId
#elseif ($pointbase)
jdbc:pointbase:server://@pointbase.server@:@pointbase.port/pointbase.${applicationId}@,new
#elseif ($postgres)
- jdbc:postgresql://$jdbcServerName/$applicationId
+ jdbc:postgresql://localhost/$applicationId
#elseif ($sybase)
-
jdbc:sybase:Tds:$jdbcServerName:$jdbcPortNumber/${applicationId}?JCONNECT_VERSION=6
+
jdbc:sybase:Tds:localhost:5000/${applicationId}?JCONNECT_VERSION=6
#elseif ($sapdb)
- jdbc:sapdb://$jdbcServerName/$applicationId
+ jdbc:sapdb://127.0.0.1/$applicationId
#elseif ($progress)
jdbc:JdbcProgress:T:localhost:3305:$applicationId
#elseif ($derby)
jdbc:derby:$applicationId
#else
- jdbc:hsqldb:hsql://$jdbcServerName:$jdbcPortNumber
+ jdbc:hsqldb:hsql://127.0.0.1:1701
#end
</jdbc.url>
- <jdbc.username>
-#if ($jdbcUsername != "none")
- $jdbcUsername
-#end
- </jdbc.username>
- <jdbc.password>
-#if ($jdbcPassword != "none")
- $jdbcPassword
-#end
- </jdbc.password>
+ <jdbc.username>sa</jdbc.username>
+ <jdbc.password></jdbc.password>
<!--
Change exception sorder class name for appropriate database
For MySQL use:
org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
@@ -1130,7 +1106,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>andromdapp-maven-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.2-RC1-SNAPSHOT</version>
<!-- provides the injection of the script wrapper
support into the class files (this should only
be done when developing locally), uncomment
this executions element to enable
<executions>
for each project customize db profile or in mda/src/main/config/andromda.xml
corresponding hibernate namespace
for each project customize db profile or in mda/src/main/config/andromda.xml
corresponding hibernate namespace
---
R:\PCOLOT\andromda-src-3.2-SNAPSHOT-20060514\samples\conf\andromdapp\crud\configuration.xml
Wed Jun 28 10:14:56 2006
+++
R:\PCOLOT\ref-andromda-src-3.2-SNAPSHOT-20060514\andromda-src-3.2-SNAPSHOT\samples\conf\andromdapp\crud\configuration.xml
Wed Mar 01 01:32:48 2006
@@ -16,12 +16,6 @@
<property name="webservice">no</property>
<property
name="model">jar:file:${project.build.sourceDirectory}/CRUDModel.xml.zip!/CRUDModel.xml</property>
<property
name="configurationUri">${project.basedir}/src/main/config/andromda.xml</property>
- <property name="databaseType">mysql</property>
- <property name="dbDialect">MyISAM</property>
- <property name="jdbcDriverJarName">jdbc-mysql.jar</property>
- <property name="jdbcServerName">localhost</property>
- <property name="jdbcPortNumber">3306</property>
- <property name="jdbcUsername">root</property>
- <property name="jdbcPassword">none</property>
+ <property name="databaseType">hypersonic</property>
</properties>
</andromdapp>
> conserve default DB configuration even during regeneration by
> andromdapp:generate task
> --------------------------------------------------------------------------------------
>
> Key: ANDROMDAPP-20
> URL: http://jira.andromda.org/browse/ANDROMDAPP-20
> Project: AndroMDApp Project Generator
> Type: Improvement
> Environment: 3.2, Maven2, MySQL
> Reporter: Pierre Colot
> Assignee: Chad Brandon
>
> Add in andromdapp handling of DB dialect, server name, port number, jdbc
> username, jdbc password
> insert in samples/conf/andromdapp/*/configuration.xml the corresponding
> properties
> The customisation of configuration.xml allow a samples regeneration with
> the user specific db profile by cd samples ; mvn -o install
> # diff
> /root/andromda-src-3.2-SNAPSHOT-20060514-ref/andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml
>
> /root/andromda-src-3.2-SNAPSHOT-20060514/andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml
> 149a150,252
> > <prompt id="dbDialect">
> > <text>Please enter the MySql Dialect (enter 'none' or
> > 'InnoDB' or 'MyISAM')</text>
> > <preconditions>
> > <condition id="databaseType" equal="mysql"/>
> > </preconditions>
> > <responses>
> > <response>none</response>
> > <response>InnoDB</response>
> > <response>MyISAM</response>
> > </responses>
> > </prompt>
> > <prompt id="dbDialect">
> > <text>Please enter the Oracle Dialect (enter 'none' or
> > '9')</text>
> > <preconditions>
> > <condition id="databaseType" equal="oracle"/>
> > </preconditions>
> > <responses>
> > <response>none</response>
> > <response>9</response>
> > </responses>
> > </prompt>
> > <prompt id="dbDialect">
> > <text>Please enter the Oracle SyBase (enter 'none'or
> > 'AnyWhere')</text>
> > <preconditions>
> > <condition id="databaseType" equal="sybase"/>
> > </preconditions>
> > <responses>
> > <response>none</response>
> > <response>Anywhere</response>
> > </responses>
> > </prompt>
> > <prompt id="jdbcDriverJarName">
> > <text>Please enter the jdbc driver jar name (i.e.
> > 'jdbc-mysql.jar')</text>
> > <preconditions>
> > <condition id="databaseType" equal="mysql"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcDriverJarName">
> > <text>Please enter the jdbc driver jar name (i.e. For
> > Hypersonic use: 'hsqldb.jar')</text>
> > <preconditions>
> > <condition id="databaseType" notEqual="mysql"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcServerName">
> > <text>Please enter the database server name (i.e.
> > 'localhost')</text>
> > <preconditions>
> > <condition id="transactionPersistenceType"
> > notEqual="none"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcPortNumber">
> > <text>Please enter the database port number (i.e.
> > '3306')</text>
> > <preconditions>
> > <condition id="databaseType" equal="mysql"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcPortNumber">
> > <text>Please enter the database port number (i.e.
> > '1521')</text>
> > <preconditions>
> > <condition id="databaseType" equal="oracle"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcPortNumber">
> > <text>Please enter the database port number (i.e.
> > '1557')</text>
> > <preconditions>
> > <condition id="databaseType" equal="informix"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcPortNumber">
> > <text>Please enter the database port number (i.e.
> > '1433')</text>
> > <preconditions>
> > <condition id="databaseType" equal="mssql"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcPortNumber">
> > <text>Please enter the database port number (i.e.
> > '5000')</text>
> > <preconditions>
> > <condition id="databaseType" equal="sybase"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcPortNumber">
> > <text>Please enter the database port number (i.e.
> > '3305')</text>
> > <preconditions>
> > <condition id="databaseType" equal="progress"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcPortNumber">
> > <text>Please enter the database port number (i.e.
> > '1701')</text>
> > <preconditions>
> > <condition id="databaseType" equal="hypersonic"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcUsername">
> > <text>Please enter the username to connect to the database
> > (i.e. 'none' or i.e. 'SA')</text>
> > <preconditions>
> > <condition id="transactionPersistenceType"
> > notEqual="none"/>
> > </preconditions>
> > </prompt>
> > <prompt id="jdbcPassword">
> > <text>Please enter the password to connect to the database
> > (i.e. 'none' or i.e. 'MyPassword')</text>
> > <preconditions>
> > <condition id="transactionPersistenceType"
> > notEqual="none"/>
> > </preconditions>
> > </prompt>
> ierre samples # diff
> /root/andromda-src-3.2-SNAPSHOT-20060514-ref/andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl
>
> /root/andromda-src-3.2-SNAPSHOT-20060514/andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl
> 881c881,885
> < org.hibernate.dialect.MySQLInnoDBDialect
> ---
> > #if ($dbDialect == "none")
> > org.hibernate.dialect.MySQLDialect
> > #else
> > org.hibernate.dialect.MySQL${dbDialect}Dialect
> > #end
> 883c887,891
> < org.hibernate.dialect.Oracle9Dialect
> ---
> > #if ($dbDialect == "none")
> > org.hibernate.dialect.OracleDialect
> > #else
> > org.hibernate.dialect.Oracle${dbDialect}Dialect
> > #end
> 894a903
> > #if ($dbDialect == "none")
> 895a905,907
> > #else
> > org.hibernate.dialect.Sybase${dbDialect}Dialect
> > #end
> 980c992
> <
> <jdbc.driver.jar>${jboss.home}/server/default/lib/hsqldb.jar</jdbc.driver.jar>
> ---
> >
> > <jdbc.driver.jar>${jboss.home}/server/default/lib/$jdbcDriverJarName</jdbc.driver.jar>
> 982c994
> <
> <jdbc.driver.jar>/path/to/hsqldb/hsqldb.jar</jdbc.driver.jar>
> ---
> >
> > <jdbc.driver.jar>${catalina.home}/shared/lib/$jdbcDriverJarName</jdbc.driver.jar>
> 983a996
> >
> 1029d1041
> < For Hypersonic use: jdbc:hsqldb:hsql://127.0.0.1:1701
> 1038a1051,1052
> > For Derby use: jdbc:derby:$applicationId
> > For Hypersonic use: jdbc:hsqldb:hsql://127.0.0.1:1701
> 1042c1056
> < jdbc:mysql://localhost:3306/$applicationId
> ---
> >
> > jdbc:mysql://${jdbcServerName}:${jdbcPortNumber}/$applicationId
> 1044c1058
> < jdbc:oracle:thin:@localhost:1521:yoursid
> ---
> >
> > jdbc:oracle:thin:@$jdbcServerName:$jdbcPortNumber:yoursid
> 1048c1062
> <
> jdbc:informix-sqli://localhost:1557/${applicationId}:INFORMIXSERVER=myserver
> ---
> >
> > jdbc:informix-sqli://$jdbcServerName:$jdbcPortNumber/${applicationId}:INFORMIXSERVER=myserver
> 1050c1064
> <
> jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=$applicationId
> ---
> >
> > jdbc:microsoft:sqlserver://$jdbcServerName:$jdbcPortNumber;DatabaseName=$applicationId
> 1054c1068
> < jdbc:postgresql://localhost/$applicationId
> ---
> > jdbc:postgresql://$jdbcServerName/$applicationId
> 1056c1070
> <
> jdbc:sybase:Tds:localhost:5000/${applicationId}?JCONNECT_VERSION=6
> ---
> >
> > jdbc:sybase:Tds:$jdbcServerName:$jdbcPortNumber/${applicationId}?JCONNECT_VERSION=6
> 1058c1072
> < jdbc:sapdb://127.0.0.1/$applicationId
> ---
> > jdbc:sapdb://$jdbcServerName/$applicationId
> 1064c1078
> < jdbc:hsqldb:hsql://127.0.0.1:1701
> ---
> > jdbc:hsqldb:hsql://$jdbcServerName:$jdbcPortNumber
> 1067,1068c1081,1090
> < <jdbc.username>sa</jdbc.username>
> < <jdbc.password></jdbc.password>
> ---
> > <jdbc.username>
> > #if ($jdbcUsername != "none")
> > $jdbcUsername
> > #end
> > </jdbc.username>
> > <jdbc.password>
> > #if ($jdbcPassword != "none")
> > $jdbcPassword
> > #end
> > </jdbc.password>
> for each project customize db profile
> # diff
> /root/andromda-src-3.2-SNAPSHOT-20060514-ref/samples/conf/andromdapp/crud/configuration.xml
>
> /root/andromda-src-3.2-SNAPSHOT-20060514/samples/conf/andromdapp/crud/configuration.xml
> 19c19,25
> < <property name="databaseType">hypersonic</property>
> ---
> > <property name="databaseType">mysql</property>
> > <property name="dbDialect">MyISAM</property>
> > <property name="jdbcDriverJarName">jdbc-mysql.jar</property>
> > <property name="jdbcServerName">localhost</property>
> > <property name="jdbcPortNumber">3306</property>
> > <property name="jdbcUsername">root</property>
> > <property name="jdbcPassword">none</property>
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://jira.andromda.org/secure/Administrators.jspa
-
For more information on JIRA, see:
http://www.atlassian.com/software/jira
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
