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/11/15 21:17:00 UTC
svn commit: r595425 - in /geronimo/plugins/roller/trunk: ./
roller-derby-database/ roller-derby-database/src/main/plan/
roller-derby-database/src/plan/ roller-derby-resources/ roller-jetty/
roller-jetty/src/main/plan/ roller-jetty/src/plan/ roller-mysq...
Author: djencks
Date: Thu Nov 15 12:16:58 2007
New Revision: 595425
URL: http://svn.apache.org/viewvc?rev=595425&view=rev
Log:
fix up plugin to work (more or less, for derby anyway) with roller and g. trunk. Intermediate commit
Added:
geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/
- copied from r591709, geronimo/plugins/roller/trunk/roller-derby-database/src/plan/
geronimo/plugins/roller/trunk/roller-jetty/src/main/plan/
- copied from r591709, geronimo/plugins/roller/trunk/roller-jetty/src/plan/
geronimo/plugins/roller/trunk/roller-mysql-database/src/main/plan/
- copied from r591709, geronimo/plugins/roller/trunk/roller-mysql-database/src/plan/
geronimo/plugins/roller/trunk/roller-tomcat/src/main/plan/
- copied from r591709, geronimo/plugins/roller/trunk/roller-tomcat/src/plan/
Removed:
geronimo/plugins/roller/trunk/roller-derby-database/src/plan/
geronimo/plugins/roller/trunk/roller-jetty/src/plan/
geronimo/plugins/roller/trunk/roller-mysql-database/src/plan/
geronimo/plugins/roller/trunk/roller-tomcat/src/plan/
Modified:
geronimo/plugins/roller/trunk/README
geronimo/plugins/roller/trunk/geronimo-plugins.xml
geronimo/plugins/roller/trunk/pom.xml
geronimo/plugins/roller/trunk/roller-derby-database/pom.xml
geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml
geronimo/plugins/roller/trunk/roller-jetty/pom.xml
geronimo/plugins/roller/trunk/roller-jetty/src/main/plan/plan.xml
geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml
geronimo/plugins/roller/trunk/roller-mysql-resources/pom.xml
geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
geronimo/plugins/roller/trunk/roller-tomcat/src/main/plan/plan.xml
Modified: geronimo/plugins/roller/trunk/README
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/README?rev=595425&r1=595424&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/README (original)
+++ geronimo/plugins/roller/trunk/README Thu Nov 15 12:16:58 2007
@@ -2,7 +2,9 @@
Build instructions:
-build roller from svn 4.0_rc1 tag after applying roller-maven_ant_task_070902_0.patch (in Jira GERONIMO-2994) by issuing 'ant mvn-install' this will build roller and place the roller-weblogger.war file in your local maven repo.
+build roller from svn 4.0_rc2 tag after applying roller-maven_ant_task_070918_0.patch (in Jira GERONIMO-2994) by issuing
+'ant mvn-install' from rollers root dir this will build roller and place the roller-weblogger.war file (needed by the plugin)
+in your local maven repo.
Theoretically at this point you should be able to run
@@ -13,12 +15,15 @@
Copy the geronimo-plugins.xml file to ~/.m2/repository so geronimo will be able to treat the maven repo as a plugin repo.
Change the content of the default-repository tag (near the end of the file) to match the path to your repository.
-Now start geronimo (2.0.1) and go to the DB Manager page and create a empty derby database called 'roller' then go to the plugins page in the admin console,
-add your local maven repo as a plugin repo, search for plugins, and install the roller-jetty plugin (if you are geronimo-jetty) it will simultaneous pull in the derby database plugin.
-You can chose to install the roller-mysql plugin module and by using the artifact aliasing (var/config/artifact_aliases.properties) to switch to the mysql database.
-
-Start the plugins from the war page or the plugins page (the war page will give more info if somethign goes wrong)
-
-Roller should be ready to use at /roller
+Now start geronimo (2.0.1) and go to the plugins page in the admin console, add your local maven repo as a plugin repo, search
+for plugins, and install the roller-jetty plugin (if you are geronimo-jetty) it will simultaneous pull in the derby database plugin.
+Accessing roller at this point for instance via the /roller link in "Application" -->> "Web App WARs" will initiate rollers automatic
+installation function that will set up the roller derby database and you will be up and running using the derby database.
+At any time you can start using mysql as database back-end by installing the roller-mysql plugin module (this will stop any running
+instance of roller). To complete the database switch put the following line in var/config/artifact_aliases.properties
+org.apache.geronimo.plugins/roller-derby-database//car=org.apache.geronimo.plugins/roller-mysql-database/0.0.1-SNAPSHOT/car
+and create a empty mysql database called 'roller' with the user 'roller' and password 'roller', restart the geronimo server, go to
+"Application" -->> "Web App WARs" start roller and click on the /roller link to start up roller and you will be up and running with the
+mysql-database as back-end.
Modified: geronimo/plugins/roller/trunk/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/geronimo-plugins.xml?rev=595425&r1=595424&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/geronimo-plugins.xml (original)
+++ geronimo/plugins/roller/trunk/geronimo-plugins.xml Thu Nov 15 12:16:58 2007
@@ -3,7 +3,7 @@
<plugin>
<name>Roller Derby database</name>
- <module-id>org.apache.geronimo.plugins/roller-derby-database/0.0.1-SNAPSHOT/car</module-id>
+ <module-id>org.apache.geronimo.plugins/roller-derby-database/0.0.2-SNAPSHOT/car</module-id>
<category>Application</category>
<description>Derby database for Roller</description>
@@ -18,7 +18,7 @@
<plugin>
<name>Roller MySql database</name>
- <module-id>org.apache.geronimo.plugins/roller-mysql-database/0.0.1-SNAPSHOT/car</module-id>
+ <module-id>org.apache.geronimo.plugins/roller-mysql-database/0.0.2-SNAPSHOT/car</module-id>
<category>Application</category>
<description>Mysql database for Roller</description>
@@ -34,7 +34,7 @@
<plugin>
<name>Roller 4.0 on Jetty</name>
- <module-id>org.apache.geronimo.plugins/roller-jetty/0.0.1-SNAPSHOT/car</module-id>
+ <module-id>org.apache.geronimo.plugins/roller-jetty/0.0.2-SNAPSHOT/car</module-id>
<category>Application</category>
<description>
This version of the Roller application works with the Geronimo/Jetty distribution.
@@ -53,7 +53,7 @@
<plugin>
<name>Roller 4.0 on Tomcat</name>
- <module-id>org.apache.geronimo.plugins/roller-tomcat/0.0.1-SNAPSHOT/car</module-id>
+ <module-id>org.apache.geronimo.plugins/roller-tomcat/0.0.2-SNAPSHOT/car</module-id>
<category>Application</category>
<description>
This version of the Roller application works with the Geronimo/Tomcat distribution.
Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=595425&r1=595424&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Thu Nov 15 12:16:58 2007
@@ -28,13 +28,13 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<name>Geronimo :: Roller:: Parent</name>
<packaging>pom</packaging>
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.0.1</geronimoVersion>
+ <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
<gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
@@ -47,65 +47,67 @@
<dependencyManagement>
<dependencies>
+<!--
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-database</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-resources</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-mysql-database</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-mysql-resources</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-jetty</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-tomcat</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<type>car</type>
</dependency>
-
+-->
+
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger</artifactId>
<type>war</type>
- <version>4.0_rc1</version>
+ <version>4.0_rc2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
- <version>2.0.1</version>
+ <version>2.1-SNAPSHOT</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</artifactId>
- <version>2.0.1</version>
+ <version>2.1-SNAPSHOT</version>
<type>car</type>
</dependency>
@@ -126,21 +128,21 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
- <version>2.0.1</version>
+ <version>2.1-SNAPSHOT</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
- <version>2.0.1</version>
+ <version>2.1-SNAPSHOT</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
- <version>2.0.1</version>
+ <version>2.1-SNAPSHOT</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -179,7 +181,7 @@
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.1-SNAPSHOT</version>
<extensions>true</extensions>
</plugin>
@@ -252,7 +254,7 @@
<modules>
<module>roller-derby-resources</module>
<module>roller-derby-database</module>
- <module>roller-mysql-resources</module>
+ <!--<module>roller-mysql-resources</module>-->
<module>roller-mysql-database</module>
<module>roller-jetty</module>
<module>roller-tomcat</module>
Modified: geronimo/plugins/roller/trunk/roller-derby-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-database/pom.xml?rev=595425&r1=595424&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/pom.xml Thu Nov 15 12:16:58 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -35,12 +35,15 @@
<packaging>car</packaging>
<dependencies>
+<!--
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-resources</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
<type>jar</type>
</dependency>
-
+-->
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
@@ -76,6 +79,10 @@
<artifactId>tranql-connector-derby-embed-local</artifactId>
<type>rar</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml?rev=595425&r1=595424&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml Thu Nov 15 12:16:58 2007
@@ -28,19 +28,21 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-resources</artifactId>
<name>Geronimo Configs :: Roller derby resources jar repackaging from war</name>
- <packaging>application-assembly</packaging>
+ <!--<packaging>application-assembly</packaging>-->
+ <packaging>jar</packaging>
<dependencies>
</dependencies>
<build>
+<!--
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -85,6 +87,7 @@
</executions>
</plugin>
</plugins>
+-->
</build>
Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=595425&r1=595424&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Thu Nov 15 12:16:58 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -44,14 +44,22 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>javamail</artifactId>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-resources</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-database</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
<type>car</type>
</dependency>
@@ -71,12 +79,6 @@
<type>car</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>javamail</artifactId>
- <type>car</type>
- </dependency>
-
</dependencies>
@@ -105,6 +107,10 @@
<artifactId>roller-weblogger</artifactId>
<type>war</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/plugins/roller/trunk/roller-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/src/main/plan/plan.xml?rev=595425&r1=591709&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/src/main/plan/plan.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/src/main/plan/plan.xml Thu Nov 15 12:16:58 2007
@@ -24,6 +24,14 @@
<hidden-classes>
<filter>antlr</filter>
<filter>org.apache.commons.digester</filter>
+ <filter>commons-beanutils</filter>
+ <filter>commons-digester</filter>
+ <filter>commons-collections</filter>
+ <filter>commons-lang</filter>
+ <filter>jdom</filter>
+ <filter>org.apache.openjpa</filter>
+ <filter>org.springframework</filter>
+ <filter>META-INF/spring</filter>
</hidden-classes>
</environment>
@@ -65,8 +73,8 @@
<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.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>-->
- <property name="openjpa.jdbc.SynchronizeMappings" value=""/>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+ <!--<property name="openjpa.jdbc.SynchronizeMappings" value=""/>-->
<!-- JIRA #OPENJPA-256 workaround not completely sure its needed and it is probably a performance killer-->
<property name="openjpa.QueryCompilationCache" value="false"/>
<!--<property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>-->
Modified: geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml?rev=595425&r1=595424&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml Thu Nov 15 12:16:58 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,11 +36,14 @@
<packaging>car</packaging>
<dependencies>
+<!--
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-mysql-resources</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
<type>jar</type>
</dependency>
+-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -79,6 +82,10 @@
<artifactId>tranql-connector-ra</artifactId>
<type>rar</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/plugins/roller/trunk/roller-mysql-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-resources/pom.xml?rev=595425&r1=595424&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-resources/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-resources/pom.xml Thu Nov 15 12:16:58 2007
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=595425&r1=595424&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Thu Nov 15 12:16:58 2007
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -47,6 +47,7 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-database</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
<type>car</type>
</dependency>
@@ -91,6 +92,10 @@
<artifactId>roller-weblogger</artifactId>
<type>war</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/plugins/roller/trunk/roller-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/src/main/plan/plan.xml?rev=595425&r1=591709&r2=595425&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/src/main/plan/plan.xml Thu Nov 15 12:16:58 2007
@@ -23,7 +23,7 @@
<environment>
<hidden-classes>
<filter>antlr</filter>
- <!-- <filter>org.apache.commons.digester</filter>
+ <filter>org.apache.commons.digester</filter>
<filter>commons-beanutils</filter>
<filter>commons-digester</filter>
<filter>commons-collections</filter>
@@ -31,7 +31,7 @@
<filter>jdom</filter>
<filter>org.apache.openjpa</filter>
<filter>org.springframework</filter>
- <filter>META-INF/spring</filter> -->
+ <filter>META-INF/spring</filter>
</hidden-classes>
</environment>