[ http://jira.andromda.org/browse/ANDROMDAPP-22?page=comments#action_12944
]
Pierre Colot commented on ANDROMDAPP-22:
----------------------------------------
Resubmit diff in unified format
---
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>
> Improvement to handle jdbc context not reckognized by tomcat 5.0 due to Major
> change between Tomcat version 5.0 and 5.x
> -----------------------------------------------------------------------------------------------------------------------
>
> Key: ANDROMDAPP-22
> URL: http://jira.andromda.org/browse/ANDROMDAPP-22
> Project: AndroMDApp Project Generator
> Type: Improvement
> Versions: 3.2-RC1
> Environment: compatibilty for Tomcat 5.0 and 5.5
> Reporter: Pierre Colot
> Assignee: Chad Brandon
> Priority: Minor
>
> 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
> 119a120,129
> > <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>
> ./andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/context.xml.vsl
> <?xml version="1.0" encoding="UTF-8"?>
> #if ($tomcatVersion == "0")
> <Context path="/$applicationId"
> docBase="${applicationId}-web-${applicationVersion}"
> debug="99" reloadable="true" crossContext="true">
> <!-- not back ported from 5.5.x antiJARLocking="true"
> antiResourceLocking="false"-->
> <!-- Logger className="org.apache.catalina.logger.FileLogger"
> prefix="localhost_DBTest_log." suffix=".txt"
> timestamp="true"/ -->
> <Resource name="${dataSource.name}"
> auth="Container"
> type="javax.sql.DataSource"/>
> <ResourceParams name="${dataSource.name}">
> <parameter>
> <name>factory</name>
> <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
> </parameter>
> <!-- Maximum number of dB connections in pool. Make sure you
> configure your mysqld max_connections large enough to handle
> all of your db connections. Set to 0 for no limit.
> -->
> <parameter>
> <name>maxActive</name>
> <value>100</value>
> </parameter>
> <!-- Maximum number of idle dB connections to retain in pool.
> Set to -1 for no limit. See also the DBCP documentation on this
> and the minEvictableIdleTimeMillis configuration parameter.
> -->
> <parameter>
> <name>maxIdle</name>
> <value>30</value>
> </parameter>
> <!-- Maximum time to wait for a dB connection to become available
> in ms, in this example 10 seconds. An Exception is thrown if
> this timeout is exceeded. Set to -1 to wait indefinitely.
> -->
> <parameter>
> <name>maxWait</name>
> <value>10000</value>
> </parameter>
> <!-- MySQL dB username and password for dB connections -->
> <parameter>
> <name>username</name>
> <value>${jdbc.username}</value>
> </parameter>
> <parameter>
> <name>password</name>
> <value>${jdbc.password}</value>
> </parameter>
> <!-- Class name for the official MySQL Connector/J driver -->
> <parameter>
> <name>driverClassName</name>
> <value>${jdbc.driver}</value>
> </parameter>
> <!-- The JDBC connection url for connecting to your MySQL dB.
> The autoReconnect=true argument to the url makes sure that the
> mm.mysql JDBC Driver will automatically reconnect if mysqld closed
> the
> connection. mysqld by default closes idle connections after 8 hours.
> -->
> <parameter>
> <name>url</name>
> <value>${jdbc.url}?autoReconnect=true</value>
> </parameter>
> <!--not back ported from 5.5.x defaultAutoCommit="false"
> removeAbandoned="true"
> removeAbandonedTimeout="60" logAbandoned="true"/ -->
> </ResourceParams>
> </Context>
> #else
> <Context path="/$applicationId"
> docBase="${applicationId}-web-${applicationVersion}"
> debug="99" reloadable="true" antiJARLocking="true"
> antiResourceLocking="false">
> <Resource name="${dataSource.name}" auth="Container"
> type="javax.sql.DataSource"
> maxActive="100" maxIdle="30" maxWait="10000"
> driverClassName="${jdbc.driver}"
> username="${jdbc.username}" password="${jdbc.password}"
> url="${jdbc.url}"
> defaultAutoCommit="false" removeAbandoned="true"
> removeAbandonedTimeout="60" logAbandoned="true"/>
> </Context>
> #end
--
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
