Author: djencks
Date: Mon Jan 14 10:25:44 2008
New Revision: 611873

URL: http://svn.apache.org/viewvc?rev=611873&view=rev
Log:
Apply roller_4_0_plugin_080103.patch except for plugin prerequisites

Modified:
    geronimo/plugins/roller/trunk/README
    geronimo/plugins/roller/trunk/pom.xml
    geronimo/plugins/roller/trunk/roller-derby-database/pom.xml
    geronimo/plugins/roller/trunk/roller-jetty/pom.xml
    geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml
    geronimo/plugins/roller/trunk/roller-tomcat/pom.xml

Modified: geronimo/plugins/roller/trunk/README
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/README?rev=611873&r1=611872&r2=611873&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/README (original)
+++ geronimo/plugins/roller/trunk/README Mon Jan 14 10:25:44 2008
@@ -2,28 +2,25 @@
 
 Build instructions:
 
-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.
+Check out Roller 4.0 
+svn checkout https://svn.apache.org/repos/asf/roller/tags/roller_4.0 roller_4.0
 
-Theoretically at this point you should be able to run 
+From the roller_4.0 root directory issue 'ant mvn-get' this will fetch and install the maven task maven-ant-tasks-2.0.7.jar 
+into your roller_4.0/tools directory. You need to issue this command ones before using maven from ant.   
+To build Roller and install the roller artifacts needed by this plugin into your local maven repository issue 'ant mvn-install'
 
-mvn
+From the roller plugin root directory issue 'mvn' to do a top level build of the plugin.
 
-and do a top level build but currently it seems that you have to build each module individually once before this will work.
-
-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 plugins page in the admin console, add your local maven repo as a plugin repo, search 
+Now start Geronimo (2.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. 
+Roller with MySql:
+At any time you can start using mysql as database back-end by installing the roller-mysql plugin module.
+Before installing the roller-mysql plugin create a empty mysql database called 'roller' with the user 'roller' and password 'roller'. 
+After installing the roller-mysql plugin you may need to restart roller for the database change to take effect this can be done from 
+Geronimos console via "Application" -->> "Web App WARs". 
+Accessing /roller at this point will initiate rollers automatic installation function and populate the newly installed roller mysql 
+database. 

Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=611873&r1=611872&r2=611873&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Mon Jan 14 10:25:44 2008
@@ -51,7 +51,7 @@
                 <groupId>org.apache.roller</groupId>
                 <artifactId>roller-weblogger</artifactId>
                 <type>war</type>
-                <version>4.0_rc2</version>
+                <version>4.0</version>
             </dependency>
                       
             <dependency>

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=611873&r1=611872&r2=611873&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/pom.xml Mon Jan 14 10:25:44 2008
@@ -18,7 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     
@@ -33,16 +34,9 @@
     <artifactId>roller-derby-database</artifactId>
     <name>Geronimo Plugins :: Roller Derby Database</name>
     <packaging>car</packaging>
+    <description>This plugin provides the Roller Derby Database for the Apache Roller plugin.</description>     
     
     <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>

Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=611873&r1=611872&r2=611873&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Mon Jan 14 10:25:44 2008
@@ -34,6 +34,8 @@
     <artifactId>roller-jetty</artifactId>
     <name>Geronimo Plugins :: Roller for Jetty</name>
     <packaging>car</packaging>
+    <description>Apache Roller is a full-featured, multi-user and group-blog server suitable for blog sites large and small.
+                 This plugin provides Roller for the Geronimo/Jetty distribution.</description> 
 
     <dependencies>
 
@@ -46,6 +48,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>javamail</artifactId>
+            <version>2.1-SNAPSHOT</version>
             <type>car</type>
         </dependency>
 
@@ -129,6 +132,10 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
+                    <instance>
+                        <plugin-artifact>
+                        </plugin-artifact>
+                    </instance>                      
                 </configuration>
             </plugin>
         </plugins>

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=611873&r1=611872&r2=611873&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml Mon Jan 14 10:25:44 2008
@@ -34,16 +34,9 @@
     <artifactId>roller-mysql-database</artifactId>
     <name>Geronimo Plugins :: Roller MySql Database</name>
     <packaging>car</packaging>
+    <description>This plugin provides the Roller MySql Database for the Apache Roller plugin.</description>
 
     <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>

Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=611873&r1=611872&r2=611873&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Mon Jan 14 10:25:44 2008
@@ -35,7 +35,9 @@
     <artifactId>roller-tomcat</artifactId>
     <name>Geronimo Plugins :: Roller for Tomcat</name>
     <packaging>car</packaging>
-
+    <description>Apache Roller is a full-featured, multi-user and group-blog server suitable for blog sites large and small.
+                 This plugin provides Roller for the Geronimo/Tomcat distribution.</description> 
+    
     <dependencies>
 
         <dependency>
@@ -121,6 +123,10 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
+                    <instance>
+                        <plugin-artifact>
+                        </plugin-artifact>
+                    </instance>                    
                 </configuration>
             </plugin>
         </plugins>