Return-Path: 
 <scm-return-23582-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 75932 invoked from network); 15 Nov 2007 20:31:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 Nov 2007 20:31:39 -0000
Received: (qmail 58830 invoked by uid 500); 15 Nov 2007 20:31:22 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 58800 invoked by uid 500); 15 Nov 2007 20:31:22 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 58715 invoked by uid 99); 15 Nov 2007 20:31:21 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2007 12:31:21 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2007 20:31:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3785F1A983E; Thu, 15 Nov 2007 12:31:13 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r595442 - in /geronimo/plugins/roller/trunk: ./
 roller-derby-resources/ roller-jetty/ roller-mysql-resources/
 roller-resources/ roller-resources/src/ roller-tomcat/
Date: Thu, 15 Nov 2007 20:31:12 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071115203113.3785F1A983E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Thu Nov 15 12:31:11 2007
New Revision: 595442

URL: http://svn.apache.org/viewvc?rev=595442&view=rev
Log:
renaming, cleanup

Added:
    geronimo/plugins/roller/trunk/roller-resources/
      - copied from r591709, geronimo/plugins/roller/trunk/roller-derby-resources/
    geronimo/plugins/roller/trunk/roller-resources/LICENSE.txt
      - copied unchanged from r595440, geronimo/plugins/roller/trunk/roller-derby-resources/LICENSE.txt
    geronimo/plugins/roller/trunk/roller-resources/NOTICE.txt
      - copied unchanged from r595440, geronimo/plugins/roller/trunk/roller-derby-resources/NOTICE.txt
    geronimo/plugins/roller/trunk/roller-resources/pom.xml
      - copied, changed from r595440, geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml
    geronimo/plugins/roller/trunk/roller-resources/src/
      - copied from r595440, geronimo/plugins/roller/trunk/roller-derby-resources/src/
Removed:
    geronimo/plugins/roller/trunk/roller-derby-resources/
    geronimo/plugins/roller/trunk/roller-mysql-resources/
Modified:
    geronimo/plugins/roller/trunk/pom.xml
    geronimo/plugins/roller/trunk/roller-jetty/pom.xml
    geronimo/plugins/roller/trunk/roller-tomcat/pom.xml

Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=595442&r1=595441&r2=595442&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Thu Nov 15 12:31:11 2007
@@ -47,50 +47,6 @@
 
     <dependencyManagement>
         <dependencies>
-<!--
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>roller-derby-database</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>     
-                                
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>roller-derby-resources</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
-                <type>jar</type>
-            </dependency> 
-
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>roller-mysql-database</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>
-       
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>roller-mysql-resources</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
-                <type>jar</type>
-            </dependency>        
-          
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>roller-jetty</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>   
-            
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>roller-tomcat</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>                                   
--->
-
             <dependency>
                 <groupId>org.apache.roller</groupId>
                 <artifactId>roller-weblogger</artifactId>
@@ -252,13 +208,11 @@
     </dependencies>
 
     <modules>
-        <module>roller-derby-resources</module>
+        <module>roller-resources</module>
         <module>roller-derby-database</module>
-        <!--<module>roller-mysql-resources</module>-->
         <module>roller-mysql-database</module>
         <module>roller-jetty</module>
         <module>roller-tomcat</module>
-        <!--<module>roller-war</module>-->
     </modules>
 
 </project>

Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=595442&r1=595441&r2=595442&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Thu Nov 15 12:31:11 2007
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>roller-derby-resources</artifactId>
+            <artifactId>roller-resources</artifactId>
             <version>0.0.2-SNAPSHOT</version>
             <type>jar</type>
         </dependency>

Copied: geronimo/plugins/roller/trunk/roller-resources/pom.xml (from r595440, geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-resources/pom.xml?p2=geronimo/plugins/roller/trunk/roller-resources/pom.xml&p1=geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml&r1=595440&r2=595442&rev=595442&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-resources/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-resources/pom.xml Thu Nov 15 12:31:11 2007
@@ -33,61 +33,14 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>roller-derby-resources</artifactId>
-    <name>Geronimo Configs :: Roller derby resources jar repackaging from war</name>
-    <!--<packaging>application-assembly</packaging>-->
+    <artifactId>roller-resources</artifactId>
+    <name>Geronimo Configs :: Roller configuration resources jar</name>
     <packaging>jar</packaging>
 
     <dependencies>
     </dependencies>
 
     <build>
-<!--
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-
-                    <execution>
-                        <id>unpack-distribution</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.roller</groupId>
-                                    <artifactId>roller-weblogger</artifactId>
-                                    <type>war</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
--->
     </build>
 
 

Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=595442&r1=595441&r2=595442&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Thu Nov 15 12:31:11 2007
@@ -45,23 +45,30 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>javamail</artifactId>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>roller-derby-database</artifactId>
+            <artifactId>roller-resources</artifactId>
             <version>0.0.2-SNAPSHOT</version>
-            <type>car</type>
+            <type>jar</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>roller-derby-database</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
             <type>car</type>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>javamail</artifactId>
+            <artifactId>tomcat6-deployer</artifactId>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>