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/09/04 03:11:08 UTC
svn commit: r572472 - in /geronimo/plugins/roller/trunk: ./
roller-derby-database/ roller-derby-database/src/main/resources/META-INF/
roller-derby-database/src/plan/ roller-derby-resources/
roller-derby-resources/src/main/assembly/ roller-derby-resourc...
Author: djencks
Date: Mon Sep 3 18:11:07 2007
New Revision: 572472
URL: http://svn.apache.org/viewvc?rev=572472&view=rev
Log:
Apply roller_plugin_070803.patch
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-database/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/plugins/roller/trunk/roller-derby-database/src/plan/plan.xml
geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml
geronimo/plugins/roller/trunk/roller-derby-resources/src/main/assembly/bin.xml
geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/planet-custom.properties
geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/roller-custom.properties
geronimo/plugins/roller/trunk/roller-jetty/pom.xml
geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/plugins/roller/trunk/roller-jetty/src/plan/plan.xml
geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml
geronimo/plugins/roller/trunk/roller-mysql-database/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/plugins/roller/trunk/roller-mysql-database/src/plan/plan.xml
geronimo/plugins/roller/trunk/roller-mysql-resources/pom.xml
geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/assembly/bin.xml
geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/planet-custom.properties
geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/roller-custom.properties
geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/plugins/roller/trunk/roller-tomcat/src/plan/plan.xml
Modified: geronimo/plugins/roller/trunk/README
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/README?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/README (original)
+++ geronimo/plugins/roller/trunk/README Mon Sep 3 18:11:07 2007
@@ -2,14 +2,7 @@
Build instructions:
-build roller from svn after applying ROL-1482
-
-After building roller you will find the zip files in apps/weblogger/dist
-Put the roller zip into your local maven repo by running
-
-mvn install:install-file -DgroupId=org.apache.roller -DartifactId=roller -Dversion=4.0-dev -Dpackaging=zip -Dfile=apache-roller-4.0-dev.zip
-(required jars might not be needed, I haven't checked recently)
-mvn install:install-file -DgroupId=org.apache.roller -DartifactId=required-jars-roller -Dversion=4.0-dev -Dpackaging=zip -Dfile=required-jars-roller-4.0-dev.zip
+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.
Theoretically at this point you should be able to run
@@ -20,8 +13,9 @@
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), 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 derby database plugin,
-and then the roller-jetty plugin (if you are geronimo-jetty)
+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)
Modified: geronimo/plugins/roller/trunk/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/geronimo-plugins.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/geronimo-plugins.xml (original)
+++ geronimo/plugins/roller/trunk/geronimo-plugins.xml Mon Sep 3 18:11:07 2007
@@ -2,60 +2,70 @@
<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>
+ <name>Roller Derby database</name>
+ <module-id>org.apache.geronimo.plugins/roller-derby-database/0.0.1-SNAPSHOT/car</module-id>
<category>Application</category>
- <description>derby database for roller</description>
+ <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>
+ <geronimo-version>2.0.1</geronimo-version>
<dependency>org.apache.geronimo.configs/system-database//car</dependency>
+ <dependency>org.apache.geronimo.plugins/roller-derby-resources//jar</dependency>
</plugin>
<plugin>
<name>Roller MySql database</name>
- <module-id>org.apache.geronimo.plugins/roller-mysql-database/2.0-SNAPSHOT/car</module-id>
+ <module-id>org.apache.geronimo.plugins/roller-mysql-database/0.0.1-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>
+ <geronimo-version>2.0.1</geronimo-version>
<dependency>mysql/mysql-connector-java/3.1.12/jar</dependency>
- <dependency>org.apache.geronimo.plugins/geronimo-roller-mysql-resources//jar</dependency>
-
+ <dependency>org.apache.geronimo.plugins/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>
+ <name>Roller 4.0 on Jetty</name>
+ <module-id>org.apache.geronimo.plugins/roller-jetty/0.0.1-SNAPSHOT/car</module-id>
<category>Application</category>
- <description>roller on jetty</description>
+ <description>
+ This version of the Roller application works with the Geronimo/Jetty distribution.
+ It is not intended to run in the Geronimo/Tomcat distribution.
+ There is a separate version of the Roller application that works with Tomcat.
+ Please install the version appropriate to your Geronimo distribution.
+ </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>
+ <geronimo-version>2.0.1</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>
+ <name>Roller 4.0 on Tomcat</name>
+ <module-id>org.apache.geronimo.plugins/roller-tomcat/0.0.1-SNAPSHOT/car</module-id>
<category>Application</category>
- <description>roller on tomcat</description>
+ <description>
+ This version of the Roller application works with the Geronimo/Tomcat distribution.
+ It is not intended to run in the Geronimo/Jetty distribution.
+ There is a separate version of the Roller application that works with Jetty.
+ Please install the version appropriate to your Geronimo distribution.
+ </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>
+ <geronimo-version>2.0.1</geronimo-version>
<dependency>org.apache.geronimo.plugins/roller-derby-database//car</dependency>
</plugin>
Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Mon Sep 3 18:11:07 2007
@@ -23,44 +23,89 @@
<parent>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>project-config</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<name>Geronimo :: Roller:: Parent</name>
<packaging>pom</packaging>
<properties>
-
- <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
- <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${version}/car</connectorDeployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
- <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
- <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
- <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car</jpaDeployer>
+ <!-- This property is required by the car:package mojo -->
+ <geronimoVersion>2.0.1</geronimoVersion>
+
+ <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+ <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
+ <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
+ <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+ <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
+ <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>roller-derby-database</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>roller-derby-resources</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>roller-mysql-database</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>roller-mysql-resources</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>roller-jetty</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>roller-tomcat</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.roller</groupId>
- <artifactId>roller</artifactId>
- <type>zip</type>
- <version>4.0-dev</version>
+ <artifactId>roller-weblogger</artifactId>
+ <type>war</type>
+ <version>4.0_rc1</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1</version>
<type>car</type>
</dependency>
@@ -81,25 +126,24 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1</version>
<type>car</type>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>dom4j</groupId>
@@ -114,12 +158,6 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.0.5</version>
- </dependency>
-
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>3.1.12</version>
@@ -141,7 +179,7 @@
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1</version>
<extensions>true</extensions>
</plugin>
@@ -218,7 +256,7 @@
<module>roller-mysql-database</module>
<module>roller-jetty</module>
<module>roller-tomcat</module>
- <module>roller-war</module>
+ <!--<module>roller-war</module>-->
</modules>
</project>
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=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/pom.xml Mon Sep 3 18:11:07 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -38,7 +38,6 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-resources</artifactId>
- <version>${pom.version}</version>
<type>jar</type>
</dependency>
Modified: geronimo/plugins/roller/trunk/roller-derby-database/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-database/src/main/resources/META-INF/geronimo-plugin.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep 3 18:11:07 2007
@@ -19,17 +19,17 @@
<!-- $Rev$ $Date$ -->
<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
- <name>Roller derby db</name>
- <module-id>org.apache.geronimo.plugins/roller-derby-database/2.0-SNAPSHOT/car</module-id>
+ <name>Roller Derby database</name>
+ <module-id>org.apache.geronimo.plugins/roller-derby-database/2.0.1/car</module-id>
<category>Application</category>
<description>
-derby db for roller
-</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>
+ <geronimo-version>2.0.1</geronimo-version>
- <dependency>org.apache.geronimo.configs/system-database/2.0-SNAPSHOT/car</dependency>
+ <dependency>org.apache.geronimo.configs/system-database/2.0.1/car</dependency>
</geronimo-plugin>
Modified: geronimo/plugins/roller/trunk/roller-derby-database/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-database/src/plan/plan.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/src/plan/plan.xml Mon Sep 3 18:11:07 2007
@@ -54,6 +54,7 @@
</connection-definition>
</outbound-resourceadapter>
</resourceadapter>
+ <!--
<gbean name="RollerDerbyResources" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
<attribute name="testSQL">select * from userrole where 1 = 2</attribute>
<attribute name="path">META-INF/derby/createdb.sql</attribute>
@@ -61,4 +62,5 @@
<name>jdbc/rollerdb</name>
</reference>
</gbean>
+ -->
</connector>
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=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml Mon Sep 3 18:11:07 2007
@@ -28,30 +28,19 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>0.0.1-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 tgz</name>
+ <name>Geronimo Configs :: Roller derby resources jar repackaging from war</name>
<packaging>application-assembly</packaging>
<dependencies>
-<!--
- <dependency>
- <groupId>org.apache.roller</groupId>
- <artifactId>roller</artifactId>
- <version>3.1-rc6</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </dependency>
--->
-
</dependencies>
<build>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -68,8 +57,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.roller</groupId>
- <artifactId>roller</artifactId>
- <type>zip</type>
+ <artifactId>roller-weblogger</artifactId>
+ <type>war</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scratch</outputDirectory>
Modified: geronimo/plugins/roller/trunk/roller-derby-resources/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-resources/src/main/assembly/bin.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-resources/src/main/assembly/bin.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-resources/src/main/assembly/bin.xml Mon Sep 3 18:11:07 2007
@@ -31,7 +31,7 @@
<fileSets>
<fileSet>
- <directory>target/scratch/apache-roller-4.0-dev/webapp/roller/WEB-INF/classes/dbscripts/</directory>
+ <directory>target/scratch/WEB-INF/classes/dbscripts/</directory>
<outputDirectory>META-INF</outputDirectory>
<includes>
<include>derby/createdb.sql</include>
Modified: geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/planet-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/planet-custom.properties?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/planet-custom.properties (original)
+++ geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/planet-custom.properties Mon Sep 3 18:11:07 2007
@@ -5,8 +5,9 @@
output.dir=${user.home}/roller-data/planet/webapp
template.dir=${user.home}/roller-data/planet/webapp/WEB-INF/templates
-jpa.configurationType=jndi
+#clear eventual jndi setting
+jpa.configurationType=
+jpa.emf.jndi.name=PlanetPU
+
-###
-###site.frontpage.weblog.handle=admin
\ No newline at end of file
Modified: geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/roller-custom.properties?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/roller-custom.properties (original)
+++ geronimo/plugins/roller/trunk/roller-derby-resources/src/main/resources/roller-custom.properties Mon Sep 3 18:11:07 2007
@@ -2,18 +2,25 @@
planet.aggregator.enabled=true
#planet.aggregator.cache.dir=var/roller/cache
-jpa.configurationType=jndi
+roller.database.version=10.2
+installation.type=auto
+jpa.configurationType=
+jpa.emf.jndi.name=RollerPU
##
#uploads.dir=/var/roller/uploads
#search.index.dir=/var/roller/search-index
-
###
-###site.frontpage.weblog.handle=admin
+#site.frontpage.weblog.handle=admin
# Comma separated list of task classnames to be executed hourly
tasks.hourly=org.apache.roller.planet.tasks.RefreshEntriesTask
# Daily Planet task: syncs weblog list with Roller, refreshes Technorati stats
-tasks.daily=org.apache.roller.planet.tasks.SyncWebsitesTask
\ No newline at end of file
+tasks.daily=org.apache.roller.planet.tasks.SyncWebsitesTask
+
+#-----------------------------------------------------------------------------
+# Log4j logging settings
+#-----------------------------------------------------------------------------
+log4j.rootCategory.Threshold=DEBUG
\ No newline at end of file
Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Mon Sep 3 18:11:07 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -38,23 +38,20 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>roller-war</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.roller</groupId>
+ <artifactId>roller-weblogger</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-resources</artifactId>
- <version>${pom.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-database</artifactId>
- <version>${pom.version}</version>
<type>car</type>
</dependency>
@@ -69,11 +66,6 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
<type>car</type>
@@ -109,8 +101,8 @@
<deploymentConfig>${jpaDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>roller-war</artifactId>
+ <groupId>org.apache.roller</groupId>
+ <artifactId>roller-weblogger</artifactId>
<type>war</type>
</module>
</configuration>
Modified: geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep 3 18:11:07 2007
@@ -19,20 +19,20 @@
<!-- $Rev$ $Date$ -->
<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
- <name>Roller on jetty</name>
- <module-id>org.apache.geronimo.plugins/roller-jetty/2.0-SNAPSHOT/car</module-id>
+ <name>Roller 4.0 on Jetty</name>
+ <module-id>org.apache.geronimo.plugins/roller-jetty/2.0.1/car</module-id>
<category>Application</category>
<description>
-roller on jetty
-</description>
+ Roller 4.0 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>
+ <geronimo-version>2.0.1</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/jetty6/2.0-SNAPSHOT/car</id>
+ <id>org.apache.geronimo.configs/jetty6/2.0.1/car</id>
<resource-type>Web Container</resource-type>
<description>
This version of the Roller application works with the Geronimo/Jetty distribution.
@@ -41,8 +41,7 @@
Please install the version appropriate to your Geronimo distribution.
</description>
</prerequisite>
- <dependency>org.apache.geronimo.configs/j2ee-server/2.0-SNAPSHOT/car</dependency>
- <dependency>org.apache.geronimo.plugins/roller-derby-database/2.0-SNAPSHOT/car</dependency>
-<!-- <dependency>dom4j/dom4j/1.6.1/jar</dependency>
--->
+ <dependency>org.apache.geronimo.configs/j2ee-server/2.0.1/car</dependency>
+ <dependency>org.apache.geronimo.plugins/roller-derby-database/2.0.1/car</dependency>
+
</geronimo-plugin>
Modified: geronimo/plugins/roller/trunk/roller-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/src/plan/plan.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/src/plan/plan.xml Mon Sep 3 18:11:07 2007
@@ -67,6 +67,8 @@
<!--<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=""/>
+ <!-- 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)"/>-->
</properties>
</persistence-unit>
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=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml Mon Sep 3 18:11:07 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,14 +39,12 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-mysql-resources</artifactId>
- <version>${pom.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
- <version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
Modified: geronimo/plugins/roller/trunk/roller-mysql-database/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-database/src/main/resources/META-INF/geronimo-plugin.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep 3 18:11:07 2007
@@ -19,17 +19,17 @@
<!-- $Rev$ $Date$ -->
<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
- <name>Roller derby db</name>
- <module-id>org.apache.geronimo.plugins/roller-mysql-database/2.0-SNAPSHOT/car</module-id>
+ <name>Roller MySql databas</name>
+ <module-id>org.apache.geronimo.plugins/roller-mysql-database/2.0.1/car</module-id>
<category>Application</category>
<description>
-mysql db for roller
-</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>
+ <geronimo-version>2.0.1</geronimo-version>
<dependency>mysql/mysql-connector-java/3.1.12/jar</dependency>
Modified: geronimo/plugins/roller/trunk/roller-mysql-database/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-database/src/plan/plan.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/src/plan/plan.xml Mon Sep 3 18:11:07 2007
@@ -58,6 +58,7 @@
</connection-definition>
</outbound-resourceadapter>
</resourceadapter>
+ <!--
<gbean name="RollerMysqlResources" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
<attribute name="testSQL">select * from userrole where 1 = 2</attribute>
<attribute name="path">META-INF/mysql/createdb.sql</attribute>
@@ -65,4 +66,5 @@
<name>jdbc/rollerdb</name>
</reference>
</gbean>
+ -->
</connector>
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=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-resources/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-resources/pom.xml Mon Sep 3 18:11:07 2007
@@ -28,30 +28,19 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-mysql-resources</artifactId>
- <name>Geronimo Configs :: Roller mysql resources jar repackaging from tgz</name>
+ <name>Geronimo Configs :: Roller mysql resources jar repackaging from war</name>
<packaging>application-assembly</packaging>
<dependencies>
-<!--
- <dependency>
- <groupId>org.apache.roller</groupId>
- <artifactId>roller</artifactId>
- <version>3.1-rc6</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </dependency>
--->
-
</dependencies>
<build>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -68,8 +57,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.roller</groupId>
- <artifactId>roller</artifactId>
- <type>zip</type>
+ <artifactId>roller-weblogger</artifactId>
+ <type>war</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scratch</outputDirectory>
Modified: geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/assembly/bin.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/assembly/bin.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/assembly/bin.xml Mon Sep 3 18:11:07 2007
@@ -31,7 +31,7 @@
<fileSets>
<fileSet>
- <directory>target/scratch/apache-roller-4.0-dev/webapp/roller/WEB-INF/classes/dbscripts/</directory>
+ <directory>target/scratch/WEB-INF/classes/dbscripts/</directory>
<outputDirectory>META-INF</outputDirectory>
<includes>
<include>mysql/createdb.sql</include>
Modified: geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/planet-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/planet-custom.properties?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/planet-custom.properties (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/planet-custom.properties Mon Sep 3 18:11:07 2007
@@ -5,8 +5,7 @@
output.dir=${user.home}/roller-data/planet/webapp
template.dir=${user.home}/roller-data/planet/webapp/WEB-INF/templates
-jpa.configurationType=jndi
+#clear eventual jndi setting
+jpa.configurationType=
+jpa.emf.jndi.name=PlanetPU
-
-###
-###site.frontpage.weblog.handle=admin
\ No newline at end of file
Modified: geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/roller-custom.properties?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/roller-custom.properties (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-resources/src/main/resources/roller-custom.properties Mon Sep 3 18:11:07 2007
@@ -2,13 +2,14 @@
planet.aggregator.enabled=true
#planet.aggregator.cache.dir=var/roller/cache
-jpa.configurationType=jndi
+installation.type=auto
+jpa.configurationType=
+jpa.emf.jndi.name=RollerPU
##
#uploads.dir=/var/roller/uploads
#search.index.dir=/var/roller/search-index
-
###
###site.frontpage.weblog.handle=admin
@@ -16,4 +17,9 @@
tasks.hourly=org.apache.roller.planet.tasks.RefreshEntriesTask
# Daily Planet task: syncs weblog list with Roller, refreshes Technorati stats
-tasks.daily=org.apache.roller.planet.tasks.SyncWebsitesTask
\ No newline at end of file
+tasks.daily=org.apache.roller.planet.tasks.SyncWebsitesTask
+
+#-----------------------------------------------------------------------------
+# Log4j logging settings
+#-----------------------------------------------------------------------------
+log4j.rootCategory.Threshold=DEBUG
\ No newline at end of file
Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Mon Sep 3 18:11:07 2007
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,45 +39,17 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>roller-war</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.roller</groupId>
+ <artifactId>roller-weblogger</artifactId>
<type>war</type>
</dependency>
- <!-- Cant find out howto get ridd of this dependancy have to use one of the two below -->
- <!--
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>roller-derby-database</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>roller-derby-database</artifactId>
- <version>${pom.version}</version>
<type>car</type>
</dependency>
- <!--
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -115,8 +87,8 @@
<deploymentConfig>${jpaDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>roller-war</artifactId>
+ <groupId>org.apache.roller</groupId>
+ <artifactId>roller-weblogger</artifactId>
<type>war</type>
</module>
</configuration>
Modified: geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep 3 18:11:07 2007
@@ -19,21 +19,20 @@
<!-- $Rev$ $Date$ -->
<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
- <name>Roller on tomcat</name>
- <module-id>org.apache.geronimo.plugins/roller-tomcat/2.0-SNAPSHOT/car</module-id>
+ <name>Roller 4.0 on Tomcat</name>
+ <module-id>org.apache.geronimo.plugins/roller-tomcat/2.0.1/car</module-id>
<category>Application</category>
<description>
- roller on tomcat
+ Roller 4.0 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>
- <!-- <source-repository>file:///home/ppe/.m2/repository/</source-repository> -->
- <geronimo-version>2.0-SNAPSHOT</geronimo-version>
+ <geronimo-version>2.0.1</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/tomcat6/2.0-SNAPSHOT/car</id>
+ <id>org.apache.geronimo.configs/tomcat6/2.0.1/car</id>
<resource-type>Web Container</resource-type>
<description>
This version of the Roller application works with the Geronimo/Tomcat distribution.
@@ -42,8 +41,6 @@
Please install the version appropriate to your Geronimo distribution.
</description>
</prerequisite>
- <dependency>org.apache.geronimo.configs/j2ee-server/2.0-SNAPSHOT/car</dependency>
-<!-- <dependency>org.apache.geronimo.plugins/roller-derby-database/2.0-SNAPSHOT/car</dependency> -->
-<!-- <dependency>dom4j/dom4j/1.6.1/jar</dependency>
--->
+ <dependency>org.apache.geronimo.configs/j2ee-server/2.0.1/car</dependency>
+
</geronimo-plugin>
Modified: geronimo/plugins/roller/trunk/roller-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/src/plan/plan.xml?rev=572472&r1=572471&r2=572472&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/src/plan/plan.xml Mon Sep 3 18:11:07 2007
@@ -23,7 +23,15 @@
<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>
+ <filter>commons-lang</filter>
+ <filter>jdom</filter>
+ <filter>org.apache.openjpa</filter>
+ <filter>org.springframework</filter>
+ <filter>META-INF/spring</filter> -->
</hidden-classes>
</environment>
@@ -67,6 +75,8 @@
<!--<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=""/>
+ <!-- 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)"/>-->
</properties>
</persistence-unit>