geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r629667 - in /geronimo/plugins/roller/trunk: ./ geronimo-jetty-roller/ geronimo-tomcat-roller/ roller-derby-database/ roller-derby-database/src/main/plan/ roller-jetty/ roller-jetty/src/main/plan/ roller-mysql-database/ roller-repository/ r...
Date Thu, 21 Feb 2008 01:28:27 GMT
Author: djencks
Date: Wed Feb 20 17:28:18 2008
New Revision: 629667

URL: http://svn.apache.org/viewvc?rev=629667&view=rev
Log:
Getting closer to a roller plugin release

Added:
    geronimo/plugins/roller/trunk/roller-repository/
    geronimo/plugins/roller/trunk/roller-repository/org/
    geronimo/plugins/roller/trunk/roller-repository/org/apache/
    geronimo/plugins/roller/trunk/roller-repository/org/apache/roller/
    geronimo/plugins/roller/trunk/roller-repository/org/apache/roller/roller-weblogger-z/
    geronimo/plugins/roller/trunk/roller-repository/org/apache/roller/roller-weblogger-z/4.0/
    geronimo/plugins/roller/trunk/roller-repository/org/apache/roller/roller-weblogger-z/4.0/roller-weblogger-z-4.0.war   (with props)
    geronimo/plugins/roller/trunk/roller-repository/pom.xml   (with props)
    geronimo/plugins/roller/trunk/roller-weblogger-geronimo/
    geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml   (with props)
Modified:
    geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml
    geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.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/plan/plan.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-resources/pom.xml
    geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties
    geronimo/plugins/roller/trunk/roller-themes/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/geronimo-jetty-roller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml?rev=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml (original)
+++ geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml Wed Feb 20 17:28:18 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>roller-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.assemblies</groupId>

Modified: geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml?rev=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml (original)
+++ geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml Wed Feb 20 17:28:18 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>roller-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.assemblies</groupId>

Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Wed Feb 20 17:28:18 2008
@@ -15,8 +15,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 --><!-- $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>
 
@@ -28,14 +27,14 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>roller-parent</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <name>Geronimo :: Roller:: Parent</name>
     <packaging>pom</packaging>
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
-        
+        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+
         <gbeanDeployer>org.apache.geronimo.framework/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>
@@ -43,17 +42,42 @@
         <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>
+
+        <roller.version>4.0</roller.version>
+
+        <xmlrpc-server.version>3.0</xmlrpc-server.version>
+        <commons-betwixt.version>1.0-beta-1</commons-betwixt.version>
+        <commons-digester.version>1.6</commons-digester.version>
+        <jaxen.version>1.0-FCS</jaxen.version>
+        <jstl.version>1.1.2</jstl.version>
+        <saxpath.version>1.0-FCS</saxpath.version>
+        <struts-el.version>1.2.4</struts-el.version>
+        <struts.version>1.2.4</struts.version>
+        <string.version>1.0.1</string.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <!-- roller weblogger war assembled from the 4.0 zip download -->
+            <dependency>
+                <groupId>org.apache.roller</groupId>
+                <artifactId>roller-weblogger-z</artifactId>
+                <type>war</type>
+                <version>${roller.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.roller</groupId>
+                <artifactId>roller-weblogger-nolib</artifactId>
+                <type>war</type>
+                <version>${roller.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.roller</groupId>
-                <artifactId>roller-weblogger</artifactId>
+                <artifactId>roller-weblogger-geronimo</artifactId>
                 <type>war</type>
-                <version>4.0</version>
+                <version>${roller.version}</version>
             </dependency>
-                      
+
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>system-database</artifactId>
@@ -147,7 +171,7 @@
                 <version>${geronimoVersion}</version>
                 <type>car</type>
                 <scope>provided</scope>
-            </dependency>           
+            </dependency>
 
             <dependency>
                 <groupId>dom4j</groupId>
@@ -161,7 +185,7 @@
                 <version>1.2.3</version>
             </dependency>
 
-<!-- this is required only to include in the roller-mysql-database plugin.  See comments in README and plugin pom -->
+            <!-- this is required only to include in the roller-mysql-database plugin.  See comments in README and plugin pom -->
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
@@ -170,6 +194,286 @@
                 <optional>true</optional>
             </dependency>
 
+            <!-- dependencies not included in roller war WEB-INF/lib -->
+            <dependency>
+                <groupId>org.apache.roller</groupId>
+                <artifactId>roller-business</artifactId>
+                <version>${roller.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.roller</groupId>
+                <artifactId>planet-business</artifactId>
+                <version>${roller.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.roller</groupId>
+                <artifactId>roller-core</artifactId>
+                <version>${roller.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.roller</groupId>
+                <artifactId>roller-web</artifactId>
+                <version>${roller.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>xmlrpc</groupId>
+                <artifactId>xmlrpc-server</artifactId>
+                <version>${xmlrpc-server.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-betwixt</groupId>
+                <artifactId>commons-betwixt</artifactId>
+                <version>${commons-betwixt.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-digester</groupId>
+                <artifactId>commons-digester</artifactId>
+                <version>${commons-digester.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>jaxen</groupId>
+                <artifactId>jaxen</artifactId>
+                <version>${jaxen.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>saxpath</groupId>
+                <artifactId>saxpath</artifactId>
+                <version>${saxpath.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>struts</groupId>
+                <artifactId>struts-el</artifactId>
+                <version>${struts-el.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>struts</groupId>
+                <artifactId>struts</artifactId>
+                <version>${struts.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>taglibs</groupId>
+                <artifactId>string</artifactId>
+                <version>${string.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.acegisecurity</groupId>
+                <artifactId>acegi-security</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>rome</groupId>
+                <artifactId>rome</artifactId>
+                <version>0.9</version>
+            </dependency>
+
+            <dependency>
+                <groupId>rome</groupId>
+                <artifactId>rome-fetcher</artifactId>
+                <version>0.9</version>
+            </dependency>
+
+            <dependency>
+                <groupId>rome</groupId>
+                <artifactId>rome-propono</artifactId>
+                <version>0.7</version>
+            </dependency>
+
+            <!--
+                        <dependency>
+                          <groupId>org.apache.openjpa</groupId>
+                          <artifactId>openjpa</artifactId>
+                        </dependency>
+            -->
+
+            <dependency>
+                <groupId>lucene</groupId>
+                <artifactId>lucene</artifactId>
+                <version>1.4.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>oswego-concurrent</groupId>
+                <artifactId>concurrent</artifactId>
+                <version>1.3.4</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.opensymphony</groupId>
+                <artifactId>xwork</artifactId>
+                <version>2.0.4</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>1.5</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>2.0.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-core</artifactId>
+                <version>2.0.9</version>
+            </dependency>
+
+            <dependency>
+                <groupId>xmlrpc</groupId>
+                <artifactId>xmlrpc-client</artifactId>
+                <version>3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>xmlrpc</groupId>
+                <artifactId>xmlrpc-common</artifactId>
+                <version>3.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.code.guice</groupId>
+                <artifactId>guice</artifactId>
+                <version>1.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>1.6</version>
+            </dependency>
+
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm-attrs</artifactId>
+                <version>1.5.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-chain</groupId>
+                <artifactId>commons-chain</artifactId>
+                <version>1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>1.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-id</artifactId>
+                <version>0.1-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>1.3.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-validator</groupId>
+                <artifactId>commons-validator</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>apache-xalan</groupId>
+                <artifactId>serializer</artifactId>
+                <version>j_2.7.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                <version>1.1.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-spring-plugin</artifactId>
+                <version>2.0.9</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-tiles-plugin</artifactId>
+                <version>2.0.9</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tiles</groupId>
+                <artifactId>tiles-api</artifactId>
+                <version>2.0.4</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tiles</groupId>
+                <artifactId>tiles-core</artifactId>
+                <version>2.0.4</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tiles</groupId>
+                <artifactId>tiles-jsp</artifactId>
+                <version>2.0.4</version>
+            </dependency>
+
+            <dependency>
+                <groupId>xalan</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.7.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring</artifactId>
+                <version>1.2.8</version>
+            </dependency>
+
+            <dependency>
+                <groupId>jdom</groupId>
+                <artifactId>jdom</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>freemarker</groupId>
+                <artifactId>freemarker</artifactId>
+                <version>2.3.8</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -198,6 +502,11 @@
                     <artifactId>maven-enforcer-plugin</artifactId>
                     <version>1.0-alpha-2</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.1-alpha-1</version>
+                </plugin>
 
             </plugins>
         </pluginManagement>
@@ -260,6 +569,8 @@
     </dependencies>
 
     <modules>
+        <module>roller-repository</module>
+        <module>roller-weblogger-geronimo</module>
         <module>roller-resources</module>
         <module>roller-derby-database</module>
         <!--
@@ -267,12 +578,12 @@
             but apparently it is downloaded anyway.  It is not included in any plugin.  A user must install
             this mysql jar in their geronimo server by hand before installing the roller-mysql-database plugin.
           -->
-        <module>roller-mysql-database</module> 
+        <module>roller-mysql-database</module>
         <module>roller-themes</module>
         <module>roller-jetty</module>
         <module>roller-tomcat</module>
         <module>geronimo-jetty-roller</module>
-        <module>geronimo-tomcat-roller</module>             
+        <module>geronimo-tomcat-roller</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=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/pom.xml Wed Feb 20 17:28:18 2008
@@ -18,15 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<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>
-    
+
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>roller-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,8 +34,8 @@
     <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>     
-    
+    <description>This plugin provides the Roller Derby Database for the Apache Roller plugin.</description>
+
     <dependencies>
 
         <dependency>
@@ -43,20 +43,20 @@
             <artifactId>system-database</artifactId>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-local</artifactId>
             <type>rar</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
             <type>car</type>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -81,5 +81,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/plan.xml?rev=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/plan.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/plan.xml Wed Feb 20 17:28:18 2008
@@ -54,13 +54,4 @@
             </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>
-        <reference name="DataSource">
-            <name>jdbc/rollerdb</name>
-        </reference>
-    </gbean>
-     --> 
 </connector>

Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Wed Feb 20 17:28:18 2008
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>roller-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>org.apache.roller</groupId>
-            <artifactId>roller-weblogger</artifactId>
+            <artifactId>roller-weblogger-geronimo</artifactId>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
@@ -51,22 +51,12 @@
             <artifactId>javamail</artifactId>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>
             <type>car</type>
         </dependency>
-        <!-- GERONIMO-3791 workaround for next 2 dependencies -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
-            <type>car</type>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
@@ -92,6 +82,248 @@
             <artifactId>ehcache</artifactId>
         </dependency>
 
+        <!--
+                <dependency>
+                  <groupId>org.apache.roller</groupId>
+                  <artifactId>roller-business</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>org.apache.roller</groupId>
+                  <artifactId>planet-business</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>org.apache.roller</groupId>
+                  <artifactId>roller-core</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>org.apache.roller</groupId>
+                  <artifactId>roller-web</artifactId>
+                </dependency>
+        -->
+
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-betwixt</groupId>
+            <artifactId>commons-betwixt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>saxpath</groupId>
+            <artifactId>saxpath</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>struts</groupId>
+            <artifactId>struts-el</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>struts</groupId>
+            <artifactId>struts</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>string</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.acegisecurity</groupId>
+            <artifactId>acegi-security</artifactId>
+        </dependency>
+
+        <!--
+                <dependency>
+                  <groupId>rome</groupId>
+                  <artifactId>rome</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>rome</groupId>
+                  <artifactId>rome-fetcher</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>rome</groupId>
+                  <artifactId>rome-propono</artifactId>
+                </dependency>
+        -->
+        <!--
+                <dependency>
+                  <groupId>org.apache.openjpa</groupId>
+                  <artifactId>openjpa</artifactId>
+                </dependency>
+        -->
+
+        <dependency>
+            <groupId>lucene</groupId>
+            <artifactId>lucene</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>oswego-concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.opensymphony</groupId>
+            <artifactId>xwork</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.guice</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-attrs</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-chain</groupId>
+            <artifactId>commons-chain</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <!--
+                <dependency>
+                  <groupId>org.apache.commons</groupId>
+                  <artifactId>commons-id</artifactId>
+                </dependency>
+        -->
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>apache-xalan</groupId>
+            <artifactId>serializer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-tiles-plugin</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-jsp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
@@ -141,7 +373,7 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.roller</groupId>
-                        <artifactId>roller-weblogger</artifactId>
+                        <artifactId>roller-weblogger-geronimo</artifactId>
                         <type>war</type>
                     </module>
                     <useMavenDependencies>

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=629667&r1=629666&r2=629667&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 Wed Feb 20 17:28:18 2008
@@ -28,8 +28,8 @@
             <filter>commons-digester</filter>
             <filter>commons-collections</filter>
             <filter>commons-lang</filter>
-            <filter>jdom</filter>
-            <filter>org.apache.openjpa</filter> 
+            <!--<filter>jdom</filter>-->
+            <filter>org.apache.openjpa</filter>
             <filter>org.springframework</filter>
             <filter>META-INF/spring</filter>   
         </hidden-classes>
@@ -40,30 +40,6 @@
         <ref-name>mail/Session</ref-name>
         <resource-link>mail/MailSession</resource-link>
     </resource-ref>
-
-    <gbean name="roller" class="org.apache.geronimo.security.realm.GenericSecurityRealm"
-           xsi:type="dep:gbeanType"
-           xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <attribute name="realmName">roller</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-        <xml-reference name="LoginModuleConfiguration">
-            <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-2.0">
-                <log:login-module control-flag="REQUIRED" wrap-principals="false">
-                    <log:login-domain-name>roller</log:login-domain-name>
-                    <log:login-module-class>org.apache.geronimo.security.realm.providers.SQLLoginModule
-                    </log:login-module-class>
-                    <log:option name="userSelect">SELECT username, passphrase FROM rolleruser WHERE username=?
-                    </log:option>
-                    <log:option name="dataSourceApplication">null</log:option>
-                    <log:option name="groupSelect">SELECT username, rolename FROM userrole WHERE username=?</log:option>
-                    <log:option name="dataSourceName">jdbc/rollerdb</log:option>
-                </log:login-module>
-            </log:login-config>
-        </xml-reference>
-    </gbean>
 
     <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
 

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=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml Wed Feb 20 17:28:18 2008
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>roller-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -69,8 +69,8 @@
              you, uncomment the following dependency and run mvn to
              build the roller-mysql-database plugin.
           -->
-<!-- optional is intended to make this build without the mysql jar being present (its only needed to get into the plugin depenedency list).
-Currently this doesn't seem to work -->
+        <!-- optional is intended to make this build without the mysql jar being present (its only needed to get into the plugin depenedency list).
+  Currently this doesn't seem to work -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -99,7 +99,7 @@
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
-                    </useMavenDependencies>                     
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
@@ -111,16 +111,16 @@
                                 </id>
                                 <resource-type>Database Connector</resource-type>
                                 <description>
-                                    This module requires the mysql connector to be present in the Geronimo repository. 
+                                    This module requires the mysql connector to be present in the Geronimo repository.
                                     MySQL is Licensed under the GPL license: http://www.mysql.com/company/legal/licensing/
                                     MySQL is also available under a FLOSS exception: http://www.mysql.com/company/legal/licensing/foss-exception.html.
                                     The FLOSS exception only be applied to MySQL when it is used under an OSI-approved license.
 
-                                    Neither of these licenses are compatible with the goals of the Apache Software Foundation. 
-                                    Thus, we cannot let the MySQL roller plugin automaticaly download the connector for you. 
-                                    How ever if either of the above license terms are acceptable to you, you may download the 
-                                    connector into the Geronimo repository yourself and re-select/install this module to  
-                                    enable roller with a mysql connector. 
+                                    Neither of these licenses are compatible with the goals of the Apache Software Foundation.
+                                    Thus, we cannot let the MySQL roller plugin automaticaly download the connector for you.
+                                    How ever if either of the above license terms are acceptable to you, you may download the
+                                    connector into the Geronimo repository yourself and re-select/install this module to
+                                    enable roller with a mysql connector.
                                 </description>
                             </prerequisite>
                             <artifact-alias key="org.apache.geronimo.plugins/roller-derby-database/${version}/car">org.apache.geronimo.plugins/roller-mysql-database/${version}/car</artifact-alias>

Added: geronimo/plugins/roller/trunk/roller-repository/org/apache/roller/roller-weblogger-z/4.0/roller-weblogger-z-4.0.war
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-repository/org/apache/roller/roller-weblogger-z/4.0/roller-weblogger-z-4.0.war?rev=629667&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/plugins/roller/trunk/roller-repository/org/apache/roller/roller-weblogger-z/4.0/roller-weblogger-z-4.0.war
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/plugins/roller/trunk/roller-repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-repository/pom.xml?rev=629667&view=auto
==============================================================================
--- geronimo/plugins/roller/trunk/roller-repository/pom.xml (added)
+++ geronimo/plugins/roller/trunk/roller-repository/pom.xml Wed Feb 20 17:28:18 2008
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>roller-repository</artifactId>
+    <name>Geronimo Local Repository</name>
+    <packaging>jar</packaging>
+
+    <description>
+        Container for local artifacts, this is a temporary solution until a more
+        permeant Geronimo specific repository solution can be implemented.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.roller</groupId>
+            <artifactId>roller-weblogger-z</artifactId>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>module-local</id>
+            <name>Local Repository</name>
+            <url>file://${pom.basedir}/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+            <!--
+            HACK: No legal files needed here... so don't fail the build if they are missing
+            -->
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+
+                <executions>
+                    <execution>
+                        <id>install-legal-files</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            <strict>false</strict>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>verify-legal-files</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            <strict>false</strict>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/plugins/roller/trunk/roller-repository/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/roller/trunk/roller-repository/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/roller/trunk/roller-repository/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/plugins/roller/trunk/roller-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-resources/pom.xml?rev=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-resources/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-resources/pom.xml Wed Feb 20 17:28:18 2008
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>roller-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties?rev=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties (original)
+++ geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties Wed Feb 20 17:28:18 2008
@@ -33,4 +33,14 @@
 #-----------------------------------------------------------------------------
 # Log4j logging settings
 #-----------------------------------------------------------------------------
-log4j.rootCategory.Threshold=DEBUG
\ No newline at end of file
+log4j.rootCategory.Threshold=DEBUG
+
+#log4j.rootCategory=INFO, roller
+
+log4j.appender.roller=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.roller.File=${org.apache.geronimo.base.dir}${file.separator}var${file.separator}log/roller.log
+log4j.appender.roller.layout=org.apache.log4j.PatternLayout
+# geronimo style logging
+log4j.appender.roller.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+# roller style logging
+#log4j.appender.roller.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n

Modified: geronimo/plugins/roller/trunk/roller-themes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/pom.xml?rev=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-themes/pom.xml Wed Feb 20 17:28:18 2008
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>roller-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -39,35 +39,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.roller</groupId>
-            <artifactId>roller-weblogger</artifactId>
-            <type>war</type>
-        </dependency>
-        <!--  
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>     
-        -->   
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-                <!--  
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>webservices-common</artifactId>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-               --> 
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -82,10 +60,10 @@
                         <plugin-artifact>
                             <copy-file relative-to="server" dest-dir="var/roller-data">themes</copy-file>
                         </plugin-artifact>
-                    </instance>                    
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=629667&r1=629666&r2=629667&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Wed Feb 20 17:28:18 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>roller-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,13 +36,14 @@
     <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> 
-    
+        This plugin provides Roller for the Geronimo/Tomcat distribution.
+    </description>
+
     <dependencies>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
-            <artifactId>roller-weblogger</artifactId>
+            <artifactId>roller-weblogger-geronimo</artifactId>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
@@ -52,22 +53,12 @@
             <artifactId>javamail</artifactId>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>
             <type>car</type>
         </dependency>
-        <!-- GERONIMO-3791 workaround for next 2 dependencies -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
-            <type>car</type>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
@@ -84,6 +75,258 @@
         </dependency>
 
         <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+        </dependency>
+
+        <!--
+                <dependency>
+                  <groupId>org.apache.roller</groupId>
+                  <artifactId>roller-business</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>org.apache.roller</groupId>
+                  <artifactId>planet-business</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>org.apache.roller</groupId>
+                  <artifactId>roller-core</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>org.apache.roller</groupId>
+                  <artifactId>roller-web</artifactId>
+                </dependency>
+        -->
+
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-betwixt</groupId>
+            <artifactId>commons-betwixt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>saxpath</groupId>
+            <artifactId>saxpath</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>struts</groupId>
+            <artifactId>struts-el</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>struts</groupId>
+            <artifactId>struts</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>string</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.acegisecurity</groupId>
+            <artifactId>acegi-security</artifactId>
+        </dependency>
+
+        <!--
+                <dependency>
+                  <groupId>rome</groupId>
+                  <artifactId>rome</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>rome</groupId>
+                  <artifactId>rome-fetcher</artifactId>
+                </dependency>
+
+                <dependency>
+                  <groupId>rome</groupId>
+                  <artifactId>rome-propono</artifactId>
+                </dependency>
+        -->
+        <!--
+                <dependency>
+                  <groupId>org.apache.openjpa</groupId>
+                  <artifactId>openjpa</artifactId>
+                </dependency>
+        -->
+
+        <dependency>
+            <groupId>lucene</groupId>
+            <artifactId>lucene</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>oswego-concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.opensymphony</groupId>
+            <artifactId>xwork</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.guice</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-attrs</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-chain</groupId>
+            <artifactId>commons-chain</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <!--
+                <dependency>
+                  <groupId>org.apache.commons</groupId>
+                  <artifactId>commons-id</artifactId>
+                </dependency>
+        -->
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>apache-xalan</groupId>
+            <artifactId>serializer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-tiles-plugin</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-jsp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <type>car</type>
@@ -107,7 +350,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
- 
+
     </dependencies>
 
 
@@ -133,7 +376,7 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.roller</groupId>
-                        <artifactId>roller-weblogger</artifactId>                        
+                        <artifactId>roller-weblogger-geronimo</artifactId>
                         <type>war</type>
                     </module>
                     <useMavenDependencies>
@@ -144,7 +387,7 @@
                         <plugin-artifact>
                             <copy-file relative-to="server" dest-dir="var/roller-data">themes</copy-file>
                         </plugin-artifact>
-                    </instance>                    
+                    </instance>
                 </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=629667&r1=629666&r2=629667&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 Wed Feb 20 17:28:18 2008
@@ -28,7 +28,7 @@
             <filter>commons-digester</filter>
             <filter>commons-collections</filter>
             <filter>commons-lang</filter>
-            <filter>jdom</filter>
+            <!--<filter>jdom</filter>-->
             <filter>org.apache.openjpa</filter> 
             <filter>org.springframework</filter>
             <filter>META-INF/spring</filter>   
@@ -41,6 +41,7 @@
         <ref-name>mail/Session</ref-name>
         <resource-link>mail/MailSession</resource-link>
     </resource-ref>
+<!--
     <gbean name="roller" class="org.apache.geronimo.security.realm.GenericSecurityRealm"
            xsi:type="dep:gbeanType"
            xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
@@ -64,6 +65,7 @@
             </log:login-config>
         </xml-reference>
     </gbean>
+-->
 
     <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
 

Added: geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml?rev=629667&view=auto
==============================================================================
--- geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml (added)
+++ geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml Wed Feb 20 17:28:18 2008
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<project>
+    <parent>
+        <artifactId>roller-parent</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.roller</groupId>
+    <artifactId>roller-weblogger-geronimo</artifactId>
+    <packaging>war</packaging>
+
+    <name>roller-weblogger-geronimo</name>
+    <version>4.0</version>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.roller</groupId>
+            <artifactId>roller-weblogger-z</artifactId>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+
+                <executions>
+                    <execution>
+                        <id>install-legal-files</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            <strict>false</strict>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>verify-legal-files</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            <strict>true</strict>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.1-alpha-1</version>
+                <configuration>
+                    <overlays>
+                        <overlay>
+                            <id>roller</id>
+                            <groupId>org.apache.roller</groupId>
+                            <artifactId>roller-weblogger-z</artifactId>
+                            <excludes>
+                                <exclude>WEB-INF/classes/log4j.properties</exclude>
+
+                                <exclude>WEB-INF/lib/acegi-security-1.0.3.jar</exclude>
+                                <exclude>WEB-INF/lib/antlr-2.7.2.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-beanutils-1.6.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-chain-1.1.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-codec-1.3.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-collections-3.2.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-digester-1.6.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-fileupload-1.2.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-httpclient-3.0.1.jar</exclude>
+                                <!--<exclude>WEB-INF/lib/commons-id-0.1-SNAPSHOT.jar</exclude>-->
+                                <exclude>WEB-INF/lib/commons-io-1.3.1.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-lang-2.1.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-logging-1.0.4.jar</exclude>
+                                <exclude>WEB-INF/lib/commons-validator-1.3.0.jar</exclude>
+                                <exclude>WEB-INF/lib/concurrent-1.3.2.jar</exclude>
+                                <exclude>WEB-INF/lib/ehcache-1.1.jar</exclude>
+                                <exclude>WEB-INF/lib/freemarker-2.3.8.jar</exclude>
+                                <exclude>WEB-INF/lib/geronimo-j2ee-connector_1.5_spec-1.0.1.jar</exclude>
+                                <exclude>WEB-INF/lib/geronimo-jpa_3.0_spec-1.0.jar</exclude>
+                                <exclude>WEB-INF/lib/geronimo-jta_1.0.1B_spec-1.0.1.jar</exclude>
+                                <exclude>WEB-INF/lib/guice-1.0.jar</exclude>
+                                <exclude>WEB-INF/lib/jaxen-full.jar</exclude>
+                                <exclude>WEB-INF/lib/jdom.jar</exclude>
+                                <exclude>WEB-INF/lib/jstl.jar</exclude>
+                                <exclude>WEB-INF/lib/log4j-1.2.11.jar</exclude>
+                                <exclude>WEB-INF/lib/lucene-1.4.3.jar</exclude>
+                                <exclude>WEB-INF/lib/ognl-2.6.11.jar</exclude>
+                                <!--<exclude>WEB-INF/lib/openjpa-0.9.7-incubating.jar</exclude>-->
+                                <exclude>WEB-INF/lib/oro-2.0.8.jar</exclude>
+                                <!--
+                                <exclude>WEB-INF/lib/roller-business.jar</exclude>
+                                <exclude>WEB-INF/lib/roller-core.jar</exclude>
+                                <exclude>WEB-INF/lib/roller-planet-business.jar</exclude>
+                                <exclude>WEB-INF/lib/roller-web.jar</exclude>
+                                <exclude>WEB-INF/lib/rome-0.9.1-dev.jar</exclude>
+                                <exclude>WEB-INF/lib/rome-fetcher-0.9.jar</exclude>
+                                <exclude>WEB-INF/lib/rome-propono-0.7.jar</exclude>
+                                -->
+                                <exclude>WEB-INF/lib/saxpath.jar</exclude>
+                                <exclude>WEB-INF/lib/serializer.jar</exclude>
+                                <exclude>WEB-INF/lib/serp-1.11.0.jar</exclude>
+                                <exclude>WEB-INF/lib/spring.jar</exclude>
+                                <exclude>WEB-INF/lib/standard.jar</exclude>
+                                <exclude>WEB-INF/lib/struts2-core-2.0.9.jar</exclude>
+                                <exclude>WEB-INF/lib/struts2-spring-plugin-2.0.9.jar</exclude>
+                                <exclude>WEB-INF/lib/struts2-tiles-plugin-2.0.9.jar</exclude>
+                                <exclude>WEB-INF/lib/taglibs-string.jar</exclude>
+                                <exclude>WEB-INF/lib/tiles-api-2.0.4.jar</exclude>
+                                <exclude>WEB-INF/lib/tiles-core-2.0.4.jar</exclude>
+                                <exclude>WEB-INF/lib/tiles-jsp-2.0.4.jar</exclude>
+                                <exclude>WEB-INF/lib/velocity-1.5.jar</exclude>
+                                <exclude>WEB-INF/lib/ws-commons-util-1.0.1.jar</exclude>
+                                <exclude>WEB-INF/lib/xalan.jar</exclude>
+                                <exclude>WEB-INF/lib/xmlrpc-client-3.0.jar</exclude>
+                                <exclude>WEB-INF/lib/xmlrpc-common-3.0.jar</exclude>
+                                <exclude>WEB-INF/lib/xmlrpc-server-3.0.jar</exclude>
+                                <exclude>WEB-INF/lib/xwork-2.0.4.jar</exclude>
+
+
+                            </excludes>
+                        </overlay>
+                    </overlays>
+                </configuration>
+            </plugin>
+        </plugins>
+
+    </build>
+
+</project>

Propchange: geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message