You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/08/27 07:11:11 UTC
svn commit: r240393 - in /geronimo/trunk:
applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/
applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/
assemblies/j2ee-server/ etc/ modules...
Author: djencks
Date: Fri Aug 26 22:11:03 2005
New Revision: 240393
URL: http://svn.apache.org/viewcvs?rev=240393&view=rev
Log:
GERONIMO-889 switch to tranql derby connector
Removed:
geronimo/trunk/modules/derby-connector/
Modified:
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerPortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java
geronimo/trunk/assemblies/j2ee-server/project.xml
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml
geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
geronimo/trunk/sandbox/petstore/build.xml
geronimo/trunk/sandbox/petstore/maven.xml
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerPortlet.java?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerPortlet.java Fri Aug 26 22:11:03 2005
@@ -42,7 +42,7 @@
new TranQLConnectorRenderer(kernel, context));
RENDERERS
.put(
- "org.apache.geronimo.derby.connector.DerbyXAManagedConnectionFactory",
+ "org.tranql.connector.derby.EmbeddedXAMCF",
new DerbyConnectorRenderer(kernel, context));
RENDERERS
.put(
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java Fri Aug 26 22:11:03 2005
@@ -92,8 +92,8 @@
.getAttribute(gbeanName, "UserName"));
info.setDatabaseName((String) kernel.getAttribute(gbeanName,
"DatabaseName"));
- info.setCreateDatabase((String) kernel.getAttribute(gbeanName,
- "CreateDatabase"));
+ info.setCreateDatabase(((Boolean) kernel.getAttribute(gbeanName,
+ "CreateDatabase")).toString());
info.setLoginTimeout((Integer) kernel.getAttribute(gbeanName,
"LoginTimeout"));
info.setJndiName((String) kernel.getAttribute(gbeanName,
Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Fri Aug 26 22:11:03 2005
@@ -796,10 +796,10 @@
</properties>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-derby-connector</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-xa</artifactId>
+ <version>${tranql_vendors_version}</version>
+ <properties>
<geronimo.assemble>repository</geronimo.assemble>
</properties>
</dependency>
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Fri Aug 26 22:11:03 2005
@@ -83,6 +83,7 @@
openejb_version=2.0-SNAPSHOT
tranql_version=1.1-SNAPSHOT
tranql_connector_version=1.0-20050716
+tranql_vendors_version=1.0-SNAPSHOT
geronimo_spec_activation_version=1.0.2-rc4
geronimo_spec_corba_version=2.3-rc4
Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Fri Aug 26 22:11:03 2005
@@ -458,7 +458,7 @@
<ant:arg value="manager"/>
<ant:arg value="distribute"/>
<ant:arg value="target/plan/default-database-plan.xml"/>
- <ant:arg value="${maven.repo.local}/geronimo/rars/geronimo-derby-connector-${pom.currentVersion}.rar"/>
+ <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_vendors_version}.rar"/>
</ant:java>
<!-- building system database configuration-->
@@ -471,7 +471,7 @@
<ant:arg value="manager"/>
<ant:arg value="distribute"/>
<ant:arg value="target/plan/system-database-plan.xml"/>
- <ant:arg value="${maven.repo.local}/geronimo/rars/geronimo-derby-connector-${pom.currentVersion}.rar"/>
+ <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_vendors_version}.rar"/>
</ant:java>
<!-- building system activemq configuration-->
Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Fri Aug 26 22:11:03 2005
@@ -362,9 +362,9 @@
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-derby-connector</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-xa</artifactId>
+ <version>${tranql_vendors_version}</version>
<type>rar</type>
<properties>
<repository>true</repository>
Modified: geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml Fri Aug 26 22:11:03 2005
@@ -56,7 +56,7 @@
<arg>$INSTALL_PATH/bin/deployer.jar</arg>
<arg>distribute</arg>
<arg>$INSTALL_PATH/installer-temp/system-database-plan.xml</arg>
- <arg>$INSTALL_PATH/repository/geronimo/rars/geronimo-derby-connector-${GeronimoVersion}.rar</arg>
+ <arg>$INSTALL_PATH/repository/tranql/rar/tranql-connector-derby-embed-xa-${tranql_vendors_version}.rar</arg>
</executefile>
<executeForPack name="J2EE Features" />
</job>
@@ -151,15 +151,15 @@
</executefile>
<executeForPack name="UDDI Server" />
</job>
- <job name="Install Axion Database Configuration">
+ <job name="Install Derby Database Configuration">
<executefile name="$JAVA_HOME/bin/java">
<arg>-jar</arg>
<arg>$INSTALL_PATH/bin/deployer.jar</arg>
<arg>distribute</arg>
<arg>$INSTALL_PATH/installer-temp/default-database-plan.xml</arg>
- <arg>$INSTALL_PATH/repository/tranql/rars/tranql-connector-${tranql_connector_version}.rar</arg>
+ <arg>$INSTALL_PATH/repository/tranql/rar/tranql-connector-derby-embed-xa-${tranql_vendors_version}.rar</arg>
</executefile>
- <executeForPack name="Sample Axion Database" />
+ <executeForPack name="Sample Derby Database" />
</job>
<job name="Finished" />
-</processing>
\ No newline at end of file
+</processing>
Modified: geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml Fri Aug 26 22:11:03 2005
@@ -42,7 +42,7 @@
<config-property-setting name="UserName"></config-property-setting>
<config-property-setting name="Password"></config-property-setting>
<config-property-setting name="DatabaseName">DefaultDatasource</config-property-setting>
- <config-property-setting name="CreateDatabase">create</config-property-setting>
+ <config-property-setting name="CreateDatabase">true</config-property-setting>
<connectionmanager>
<single-pool>
<match-one/>
Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Fri Aug 26 22:11:03 2005
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-derby-${geronimo_version}.jar</uri>
- </dependency>
+ </dependency>
<resourceadapter>
<outbound-resourceadapter>
@@ -42,7 +42,7 @@
<config-property-setting name="UserName"></config-property-setting>
<config-property-setting name="Password"></config-property-setting>
<config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
- <config-property-setting name="CreateDatabase">create</config-property-setting>
+ <config-property-setting name="CreateDatabase">true</config-property-setting>
<connectionmanager>
<xa-transaction>
<transaction-caching/>
Modified: geronimo/trunk/sandbox/petstore/build.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/build.xml?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/build.xml (original)
+++ geronimo/trunk/sandbox/petstore/build.xml Fri Aug 26 22:11:03 2005
@@ -32,7 +32,7 @@
<replacetoken><![CDATA[</application>]]></replacetoken>
<replacevalue><![CDATA[
<module>
- <connector>geronimo-derby-connector-1.0-SNAPSHOT.rar</connector>
+ <connector>tranql-connector-derby-embed-xa-1.0-SNAPSHOT.rar</connector>
</module>
<module>
<connector>activemq-ra-3.1-SNAPSHOT.rar</connector>
Modified: geronimo/trunk/sandbox/petstore/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/maven.xml?rev=240393&r1=240392&r2=240393&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/maven.xml (original)
+++ geronimo/trunk/sandbox/petstore/maven.xml Fri Aug 26 22:11:03 2005
@@ -90,7 +90,7 @@
<ant:arg value="manager"/>
<ant:arg value="distribute"/>
<ant:arg value="${basedir}/target/plan/petstore1.3.2-db-ra-plan.xml"/>
- <ant:arg value="${maven.repo.local}/geronimo/rars/geronimo-derby-connector-${pom.currentVersion}.rar"/>
+ <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_vendors_version}.rar"/>
</ant:java>
<ant:echo>Distributing Java Pet Store Application</ant:echo>