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 2007/08/21 17:09:35 UTC
svn commit: r568159 - in /geronimo/plugins/roller: geronimo-plugins.xml
pom.xml roller-jetty/src/plan/plan.xml roller-tomcat/src/plan/plan.xml
Author: djencks
Date: Tue Aug 21 08:09:34 2007
New Revision: 568159
URL: http://svn.apache.org/viewvc?rev=568159&view=rev
Log:
GERONIMO-2994 minor tweaks to make database switching more likely to work
Modified:
geronimo/plugins/roller/geronimo-plugins.xml
geronimo/plugins/roller/pom.xml
geronimo/plugins/roller/roller-jetty/src/plan/plan.xml
geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml
Modified: geronimo/plugins/roller/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/geronimo-plugins.xml?rev=568159&r1=568158&r2=568159&view=diff
==============================================================================
--- geronimo/plugins/roller/geronimo-plugins.xml (original)
+++ geronimo/plugins/roller/geronimo-plugins.xml Tue Aug 21 08:09:34 2007
@@ -1,49 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<geronimo-plugin-list xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
- <plugin>
- <name>Roller derby db</name>
- <module-id>org.apache.geronimo.plugins/roller-derby-database/2.0-SNAPSHOT/car</module-id>
- <category>Application</category>
- <description>derby db for roller</description>
-
- <url>http://geronimo.apache.org/</url>
- <author>The Apache Geronimo development community</author>
- <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
- <geronimo-version>2.0-SNAPSHOT</geronimo-version>
-
- <dependency>org.apache.geronimo.configs/system-database//car</dependency>
- </plugin>
-
- <plugin>
- <name>Roller on jetty</name>
- <module-id>org.apache.geronimo.plugins/roller-jetty/2.0-SNAPSHOT/car</module-id>
- <category>Application</category>
- <description>roller on jetty</description>
-
- <url>http://geronimo.apache.org/</url>
- <author>The Apache Geronimo development community</author>
- <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
- <geronimo-version>2.0-SNAPSHOT</geronimo-version>
-
- <dependency>org.apache.geronimo.plugins/roller-derby-database//car</dependency>
-<!-- <dependency>dom4j/dom4j/1.6.1/jar</dependency>
--->
- </plugin>
-
- <plugin>
- <name>Roller on tomcat</name>
- <module-id>org.apache.geronimo.plugins/roller-tomcat/2.0-SNAPSHOT/car</module-id>
- <category>Application</category>
- <description>roller on tomcat</description>
-
- <url>http://geronimo.apache.org/</url>
- <author>The Apache Geronimo development community</author>
- <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
- <geronimo-version>2.0-SNAPSHOT</geronimo-version>
-
- <dependency>org.apache.geronimo.plugins/roller-derby-database//car</dependency>
-<!-- <dependency>dom4j/dom4j/1.6.1/jar</dependency>
--->
- </plugin>
- <default-repository>file:///Users/david/.m2/repository/</default-repository>
+
+ <plugin>
+ <name>Roller derby db</name>
+ <module-id>org.apache.geronimo.plugins/roller-derby-database/2.0-SNAPSHOT/car</module-id>
+ <category>Application</category>
+ <description>derby database for roller</description>
+
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+ <geronimo-version>2.0-SNAPSHOT</geronimo-version>
+
+ <dependency>org.apache.geronimo.configs/system-database//car</dependency>
+ </plugin>
+
+ <plugin>
+ <name>Roller MySql database</name>
+ <module-id>org.apache.geronimo.plugins/roller-mysql-database/2.0-SNAPSHOT/car</module-id>
+ <category>Application</category>
+ <description>Mysql database for Roller</description>
+
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">BSD - - Apache Software License (ASL) 2.0</license>
+ <geronimo-version>2.0-SNAPSHOT</geronimo-version>
+
+ <dependency>mysql/mysql-connector-java/3.1.12/jar</dependency>
+ <dependency>org.apache.geronimo.plugins/geronimo-roller-mysql-resources//jar</dependency>
+
+ <obsoletes>org.apache.geronimo.plugins/roller-derby-database//car</obsoletes>
+ </plugin>
+
+ <plugin>
+ <name>Roller on jetty</name>
+ <module-id>org.apache.geronimo.plugins/roller-jetty/2.0-SNAPSHOT/car</module-id>
+ <category>Application</category>
+ <description>roller on jetty</description>
+
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+ <geronimo-version>2.0-SNAPSHOT</geronimo-version>
+
+ <dependency>org.apache.geronimo.plugins/roller-derby-database//car</dependency>
+ </plugin>
+
+ <plugin>
+ <name>Roller on tomcat</name>
+ <module-id>org.apache.geronimo.plugins/roller-tomcat/2.0-SNAPSHOT/car</module-id>
+ <category>Application</category>
+ <description>roller on tomcat</description>
+
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+ <geronimo-version>2.0-SNAPSHOT</geronimo-version>
+
+ <dependency>org.apache.geronimo.plugins/roller-derby-database//car</dependency>
+ </plugin>
+
+ <default-repository>file:///Users/david/.m2/repository/</default-repository>
+
</geronimo-plugin-list>
Modified: geronimo/plugins/roller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/pom.xml?rev=568159&r1=568158&r2=568159&view=diff
==============================================================================
--- geronimo/plugins/roller/pom.xml (original)
+++ geronimo/plugins/roller/pom.xml Tue Aug 21 08:09:34 2007
@@ -33,8 +33,6 @@
<packaging>pom</packaging>
<properties>
- <!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.0-SNAPSHOT</geronimoVersion>
<gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
Modified: geronimo/plugins/roller/roller-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-jetty/src/plan/plan.xml?rev=568159&r1=568158&r2=568159&view=diff
==============================================================================
--- geronimo/plugins/roller/roller-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-jetty/src/plan/plan.xml Tue Aug 21 08:09:34 2007
@@ -64,10 +64,10 @@
<jta-data-source>jdbc/rollerdb</jta-data-source>
<non-jta-data-source>jdbc/NoTxrollerdb</non-jta-data-source>
<properties>
- <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
+ <!--<property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>-->
<!--<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>-->
<property name="openjpa.jdbc.SynchronizeMappings" value=""/>
- <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+ <!--<property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>-->
</properties>
</persistence-unit>
Modified: geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml?rev=568159&r1=568158&r2=568159&view=diff
==============================================================================
--- geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml Tue Aug 21 08:09:34 2007
@@ -64,10 +64,10 @@
<jta-data-source>jdbc/rollerdb</jta-data-source>
<non-jta-data-source>jdbc/NoTxrollerdb</non-jta-data-source>
<properties>
- <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
+ <!--<property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>-->
<!--<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>-->
<property name="openjpa.jdbc.SynchronizeMappings" value=""/>
- <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+ <!--<property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>-->
</properties>
</persistence-unit>