geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r614749 - in /geronimo/plugins/roller/trunk: ./ geronimo-jetty-roller/ geronimo-tomcat-roller/ roller-derby-database/ roller-jetty/ roller-mysql-database/ roller-mysql-database/src/main/plan/ roller-tomcat/
Date Thu, 24 Jan 2008 00:28:23 GMT
Author: djencks
Date: Wed Jan 23 16:28:20 2008
New Revision: 614749

URL: http://svn.apache.org/viewvc?rev=614749&view=rev
Log:
Update to new geronimo groupIds and add a couple of demo assemblies

Added:
    geronimo/plugins/roller/trunk/geronimo-jetty-roller/
      - copied from r614668, geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/
    geronimo/plugins/roller/trunk/geronimo-tomcat-roller/
      - copied from r614668, geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/
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-jetty/pom.xml
    geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml
    geronimo/plugins/roller/trunk/roller-mysql-database/src/main/plan/plan.xml
    geronimo/plugins/roller/trunk/roller-tomcat/pom.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=614749&r1=614668&r2=614749&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml (original)
+++ geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml Wed Jan 23 16:28:20 2008
@@ -23,208 +23,40 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.assemblies</groupId>
-        <artifactId>assemblies</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>geronimo-jetty6-minimal</artifactId>
-    <name>Geronimo Assemblies :: Minimal + Jetty6</name>
+    <groupId>org.apache.geronimo.assemblies</groupId>
+    <artifactId>geronimo-jetty-roller</artifactId>
+    <name>Geronimo Assemblies :: Roller + Jetty6</name>
     <packaging>application-assembly</packaging>
 
     <description>
-        A minimal Geronimo server (Little-G) assembly using the Jetty web-container.
+        A Geronimo server assembly for Roller using the Jetty web-container.
     </description>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-framework</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <type>zip</type>
             <classifier>bin</classifier>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>j2ee-system</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>client-system</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>upgrade-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>rmi-naming</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>shutdown</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>roller-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>online-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>offline-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>jsr88-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>jsr88-deploymentfactory</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>remote-deploy-jetty</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>sharedlib</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-war-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-ear-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>unavailable-client-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>unavailable-webservices-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>unavailable-ejb-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>hot-deployer</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-jetty</artifactId>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -253,7 +85,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-framework</artifactId>
-                                    <version>${version}</version>
+                                    <version>${geronimoVersion}</version>
                                     <type>tar.gz</type>
                                     <classifier>bin</classifier>
                                 </artifactItem>
@@ -262,23 +94,6 @@
                         </configuration>
                     </execution>
 
-                    <execution>
-                        <id>unpack-schemas</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-jetty6-builder</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 
@@ -297,28 +112,8 @@
                                 <!-- remove geronimo-framework-${version} prefix -->
                                 <mkdir dir="${project.build.directory}/assembly"/>
                                 <copy todir="${project.build.directory}/assembly">
-                                    <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>pre-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
-                                <copy todir="${project.build.directory}/schema">
-                                    <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
+                                    <fileset dir="${project.build.directory}/unpack/geronimo-framework-${geronimoVersion}">
                                     </fileset>
-                                    <mapper type="flatten"/>
                                 </copy>
                             </tasks>
                         </configuration>
@@ -345,6 +140,17 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <servers>
+                        <serverInstance>
+                            <name>default</name>
+                            <configFile>var/config/config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                    </servers>
+                </configuration>
             </plugin>
         </plugins>
     </build>

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=614749&r1=614668&r2=614749&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml (original)
+++ geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml Wed Jan 23 16:28:20 2008
@@ -23,209 +23,41 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.assemblies</groupId>
-        <artifactId>assemblies</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>geronimo-tomcat6-minimal</artifactId>
-    <name>Geronimo Assemblies :: Minimal + Tomcat</name>
+    <groupId>org.apache.geronimo.assemblies</groupId>
+    <artifactId>geronimo-tomcat-roller</artifactId>
+    <name>Geronimo Assemblies :: Roller on Tomcat</name>
     <packaging>application-assembly</packaging>
 
     <description>
-        A minimal Geronimo server (Little-G) assembly using the Tomcat web-container.
+        A Geronimo server assembly for Roller using the Tomcat web-container.
     </description>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-framework</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <type>zip</type>
             <classifier>bin</classifier>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>j2ee-system</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>client-system</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>upgrade-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>rmi-naming</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>remote-deploy-tomcat</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>shutdown</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>sharedlib</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>online-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>offline-deployer</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>roller-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>jsr88-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>jsr88-deploymentfactory</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-war-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-ear-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>unavailable-client-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>unavailable-webservices-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>unavailable-ejb-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>hot-deployer</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-tomcat</artifactId>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -254,7 +86,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-framework</artifactId>
-                                    <version>${version}</version>
+                                    <version>${geronimoVersion}</version>
                                     <type>tar.gz</type>
                                     <classifier>bin</classifier>
                                 </artifactItem>
@@ -263,23 +95,6 @@
                         </configuration>
                     </execution>
 
-                    <execution>
-                        <id>unpack-schemas</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-tomcat6-builder</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 
@@ -298,28 +113,8 @@
                                 <!-- remove geronimo-framework-${version} prefix -->
                                 <mkdir dir="${project.build.directory}/assembly"/>
                                 <copy todir="${project.build.directory}/assembly">
-                                    <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>pre-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
-                                <copy todir="${project.build.directory}/schema">
-                                    <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
+                                    <fileset dir="${project.build.directory}/unpack/geronimo-framework-${geronimoVersion}">
                                     </fileset>
-                                    <mapper type="flatten"/>
                                 </copy>
                             </tasks>
                         </configuration>
@@ -346,6 +141,17 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <servers>
+                        <serverInstance>
+                            <name>default</name>
+                            <configFile>var/config/config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                    </servers>
+                </configuration>
             </plugin>
 
         </plugins>

Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=614749&r1=614748&r2=614749&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Wed Jan 23 16:28:20 2008
@@ -36,7 +36,7 @@
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
         
-        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+        <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>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
@@ -57,13 +57,19 @@
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>system-database</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>javamail</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>openjpa</artifactId>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
             </dependency>
 
@@ -76,50 +82,50 @@
             </dependency>
             <dependency>
                 <groupId>org.tranql</groupId>
-                <artifactId>tranql-connector-ra</artifactId>
-                <version>1.3</version>
+                <artifactId>tranql-connector-mysql-local</artifactId>
+                <version>1.2</version>
                 <type>rar</type>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-gbean-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>connector-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>jetty6-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>jasper-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>persistence-jpa10-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>tomcat6-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
                 <scope>provided</scope>
             </dependency>           
@@ -156,9 +162,9 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.apache.geronimo.plugins</groupId>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>car-maven-plugin</artifactId>
-                    <version>2.1-SNAPSHOT</version>
+                    <version>${geronimoVersion}</version>
                     <extensions>true</extensions>
                     <configuration>
                         <category>Roller</category>
@@ -237,6 +243,8 @@
         <module>roller-mysql-database</module>
         <module>roller-jetty</module>
         <module>roller-tomcat</module>
+        <module>geronimo-jetty-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=614749&r1=614748&r2=614749&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/pom.xml Wed Jan 23 16:28:20 2008
@@ -60,7 +60,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=614749&r1=614748&r2=614749&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Wed Jan 23 16:28:20 2008
@@ -48,21 +48,25 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>javamail</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>roller-resources</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>${version}</version>
             <type>jar</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>roller-derby-database</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -77,7 +81,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <type>car</type>
             <scope>provided</scope>
@@ -113,7 +117,7 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

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=614749&r1=614748&r2=614749&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml Wed Jan 23 16:28:20 2008
@@ -47,7 +47,7 @@
 
         <dependency>
             <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-ra</artifactId>
+            <artifactId>tranql-connector-mysql-local</artifactId>
             <type>rar</type>
         </dependency>
 
@@ -62,7 +62,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
@@ -72,7 +72,7 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-ra</artifactId>
+                        <artifactId>tranql-connector-mysql-local</artifactId>
                         <type>rar</type>
                     </module>
                     <useMavenDependencies>

Modified: geronimo/plugins/roller/trunk/roller-mysql-database/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-database/src/main/plan/plan.xml?rev=614749&r1=614748&r2=614749&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/src/main/plan/plan.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/src/main/plan/plan.xml Wed Jan 23
16:28:20 2008
@@ -27,9 +27,7 @@
                     <name>jdbc/rollerdb</name>
                     <config-property-setting name="Password">roller</config-property-setting>
                     <config-property-setting name="UserName">roller</config-property-setting>
-                    <!--<config-property-setting name="DatabaseName">roller</config-property-setting>
-->
-                    <config-property-setting name="Driver">com.mysql.jdbc.Driver</config-property-setting>
-                    <config-property-setting name="ConnectionURL">jdbc:mysql://localhost:3306/roller</config-property-setting>
                   
+                    <config-property-setting name="DatabaseName">roller</config-property-setting>
                     <connectionmanager>
                         <local-transaction/>
                         <single-pool>
@@ -43,9 +41,7 @@
                     <name>jdbc/NoTxrollerdb</name>
                     <config-property-setting name="Password">roller</config-property-setting>
                     <config-property-setting name="UserName">roller</config-property-setting>
-                    <!--<config-property-setting name="DatabaseName">roller</config-property-setting>
-->
-                    <config-property-setting name="Driver">com.mysql.jdbc.Driver</config-property-setting>
-                    <config-property-setting name="ConnectionURL">jdbc:mysql://localhost:3306/roller</config-property-setting>
+                    <config-property-setting name="DatabaseName">roller</config-property-setting>
                     <connectionmanager>
                         <no-transaction/>
                         <single-pool>

Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=614749&r1=614748&r2=614749&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Wed Jan 23 16:28:20 2008
@@ -51,23 +51,28 @@
             <artifactId>javamail</artifactId>
             <type>car</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
+            <type>car</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>roller-resources</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>${version}</version>
             <type>jar</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>roller-derby-database</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <type>car</type>
             <scope>provided</scope>
@@ -104,7 +109,7 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>



Mime
View raw message