geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r556296 - in /geronimo/plugins/roller: ./ derby/ mysql/ roller-derby-resources/ roller-jetty/ roller-jetty/src/plan/ roller-mysql-resources/ roller-tomcat/ roller-tomcat/src/plan/ roller-war/
Date Sat, 14 Jul 2007 16:43:03 GMT
Author: djencks
Date: Sat Jul 14 09:43:00 2007
New Revision: 556296

URL: http://svn.apache.org/viewvc?view=rev&rev=556296
Log:
clean up the build a lot, add a parent pom

Added:
    geronimo/plugins/roller/pom.xml   (with props)
Modified:
    geronimo/plugins/roller/derby/pom.xml
    geronimo/plugins/roller/mysql/pom.xml
    geronimo/plugins/roller/roller-derby-resources/pom.xml
    geronimo/plugins/roller/roller-jetty/pom.xml
    geronimo/plugins/roller/roller-jetty/src/plan/plan.xml
    geronimo/plugins/roller/roller-mysql-resources/pom.xml
    geronimo/plugins/roller/roller-tomcat/pom.xml
    geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml
    geronimo/plugins/roller/roller-war/pom.xml

Modified: geronimo/plugins/roller/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/derby/pom.xml?view=diff&rev=556296&r1=556295&r2=556296
==============================================================================
--- geronimo/plugins/roller/derby/pom.xml (original)
+++ geronimo/plugins/roller/derby/pom.xml Sat Jul 14 09:43:00 2007
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>roller-derby-database</artifactId>
-    <version>2.0-SNAPSHOT</version>
     <name>Geronimo Plugins :: Roller Derby Database</name>
     <packaging>car</packaging>
     
@@ -45,24 +45,19 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-local</artifactId>
-            <version>1.3</version>
             <type>rar</type>
-            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
-            <version>${pom.version}</version>
             <type>car</type>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
     
@@ -71,7 +66,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <version>${pom.version}</version>
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
@@ -81,7 +75,6 @@
                     <module>
                         <groupId>org.tranql</groupId>
                         <artifactId>tranql-connector-derby-embed-local</artifactId>
-                        <version>1.3</version>
                         <type>rar</type>
                     </module>
                 </configuration>

Modified: geronimo/plugins/roller/mysql/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/mysql/pom.xml?view=diff&rev=556296&r1=556295&r2=556296
==============================================================================
--- geronimo/plugins/roller/mysql/pom.xml (original)
+++ geronimo/plugins/roller/mysql/pom.xml Sat Jul 14 09:43:00 2007
@@ -18,22 +18,23 @@
 
 <!-- $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>
-    
+
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>roller-mysql-database</artifactId>
-    <version>2.0-SNAPSHOT</version>
     <name>Geronimo Plugins :: Roller MySql Database</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
@@ -41,7 +42,7 @@
             <version>${pom.version}</version>
             <type>jar</type>
         </dependency>
-            
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
@@ -49,29 +50,26 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-                    
+
         <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-ra</artifactId>
-            <version>1.3</version>
             <type>rar</type>
         </dependency>
-        
+
         <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>3.1.12</version>
-                <type>jar</type>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <type>jar</type>
         </dependency>
-                
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <version>${pom.version}</version>
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
@@ -81,12 +79,11 @@
                     <module>
                         <groupId>org.tranql</groupId>
                         <artifactId>tranql-connector-ra</artifactId>
-                        <version>1.3</version>
                         <type>rar</type>
                     </module>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Added: geronimo/plugins/roller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/pom.xml?view=auto&rev=556296
==============================================================================
--- geronimo/plugins/roller/pom.xml (added)
+++ geronimo/plugins/roller/pom.xml Sat Jul 14 09:43:00 2007
@@ -0,0 +1,219 @@
+<?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.genesis.config</groupId>
+        <artifactId>project-config</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>roller-parent</artifactId>
+    <version>2.0-SNAPSHOT</version>
+    <name>Geronimo :: Roller:: Parent</name>
+    <packaging>pom</packaging>
+
+    <properties>
+        <!-- This property is required by the car:package mojo -->
+        <geronimoVersion>2.0-SNAPSHOT</geronimoVersion>
+
+        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
+        <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${version}/car</connectorDeployer>
+        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
+        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
+        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.roller</groupId>
+                <artifactId>roller</artifactId>
+                <type>zip</type>
+                <version>3.1-rc6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>system-database</artifactId>
+                <version>2.0-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.tranql</groupId>
+                <artifactId>tranql-connector-derby-embed-local</artifactId>
+                <version>1.3</version>
+                <type>rar</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.tranql</groupId>
+                <artifactId>tranql-connector-ra</artifactId>
+                <version>1.3</version>
+                <type>rar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>connector-deployer</artifactId>
+                <version>${pom.version}</version>
+                <type>car</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jetty6-deployer</artifactId>
+                <version>${pom.version}</version>
+                <type>car</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>tomcat6-deployer</artifactId>
+                <version>${pom.version}</version>
+                <type>car</type>
+                <scope>provided</scope>
+            </dependency>
+
+
+            <dependency>
+                <groupId>dom4j</groupId>
+                <artifactId>dom4j</artifactId>
+                <version>1.6.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.sf.ehcache</groupId>
+                <artifactId>ehcache</artifactId>
+                <version>1.2.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate</artifactId>
+                <version>3.0.5</version>
+            </dependency>
+
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>3.1.12</version>
+                <type>jar</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!--maven-assembly-plugin is from genesis project-config -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.0-alpha-4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.geronimo.plugins</groupId>
+                    <artifactId>car-maven-plugin</artifactId>
+                    <version>2.0-SNAPSHOT</version>
+                    <extensions>true</extensions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.0-alpha-2</version>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+
+                <!-- Tools includes custom packagings, install as extension to pick them
up -->
+                <extensions>true</extensions>
+
+                <executions>
+                    <execution>
+                        <id>install-legal-files</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Fail the build if no legal files were copied -->
+                            <strict>true</strict>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>verify-legal-files</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Fail the build if no legal files were found -->
+                            <strict>true</strict>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.5</jdkName>
+                    <jdkLevel>1.5</jdkLevel>
+                    <linkModules>true</linkModules>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+    </dependencies>
+
+    <modules>
+        <module>derby</module>
+        <module>mysql</module>
+        <module>roller-derby-resources</module>
+        <module>roller-jetty</module>
+        <module>roller-mysql-resources</module>
+        <module>roller-tomcat</module>
+        <module>roller-war</module>
+    </modules>
+
+</project>

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

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

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

Modified: geronimo/plugins/roller/roller-derby-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-derby-resources/pom.xml?view=diff&rev=556296&r1=556295&r2=556296
==============================================================================
--- geronimo/plugins/roller/roller-derby-resources/pom.xml (original)
+++ geronimo/plugins/roller/roller-derby-resources/pom.xml Sat Jul 14 09:43:00 2007
@@ -26,14 +26,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>geronimo-roller-derby-resources</artifactId>
-    <version>2.0-SNAPSHOT</version>
     <name>Geronimo Configs :: Roller derby resources jar repackaging from tgz</name>
     <packaging>application-assembly</packaging>
 
@@ -70,7 +70,6 @@
                                     <groupId>org.apache.roller</groupId>
                                     <artifactId>roller</artifactId>
                                     <type>zip</type>
-                                    <version>3.1-rc6</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch</outputDirectory>

Modified: geronimo/plugins/roller/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-jetty/pom.xml?view=diff&rev=556296&r1=556295&r2=556296
==============================================================================
--- geronimo/plugins/roller/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/roller-jetty/pom.xml Sat Jul 14 09:43:00 2007
@@ -18,22 +18,23 @@
 
 <!-- $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>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>roller-jetty</artifactId>
-    <version>2.0-SNAPSHOT</version>
     <name>Geronimo Plugins :: Roller for Jetty</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
 
         <dependency>
@@ -45,41 +46,43 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>geronimo-roller-derby-resources</artifactId>
+            <version>${pom.version}</version>
+            <type>jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>roller-derby-database</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency>          
- 
+        </dependency>
+
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>   
+        </dependency>
 
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>1.2.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate</artifactId>
-            <version>3.0.5</version>
-        </dependency>   
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-deployer</artifactId>
-            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-       
+
     </dependencies>
-    
 
-    
+
     <build>
         <resources>
             <resource>
@@ -87,12 +90,11 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <version>${pom.version}</version>
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
@@ -100,14 +102,13 @@
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>geronimo-roller-war</artifactId>
-            <version>${pom.version}</version>
-                       <type>war</type>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-roller-war</artifactId>
+                        <type>war</type>
                     </module>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/plugins/roller/roller-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-jetty/src/plan/plan.xml?view=diff&rev=556296&r1=556295&r2=556296
==============================================================================
--- geronimo/plugins/roller/roller-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-jetty/src/plan/plan.xml Sat Jul 14 09:43:00 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
 
   <environment>
     <hidden-classes>
@@ -37,12 +37,9 @@
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
-        <reference name="LoginService">
-            <name>JaasLoginService</name>
-        </reference>
         <xml-reference name="LoginModuleConfiguration">
-            <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
-                <log:login-module control-flag="REQUIRED" server-side="true" wrap-principals="false">
+            <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>

Modified: geronimo/plugins/roller/roller-mysql-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-mysql-resources/pom.xml?view=diff&rev=556296&r1=556295&r2=556296
==============================================================================
--- geronimo/plugins/roller/roller-mysql-resources/pom.xml (original)
+++ geronimo/plugins/roller/roller-mysql-resources/pom.xml Sat Jul 14 09:43:00 2007
@@ -26,14 +26,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>geronimo-roller-mysql-resources</artifactId>
-    <version>2.0-SNAPSHOT</version>
     <name>Geronimo Configs :: Roller mysql resources jar repackaging from tgz</name>
     <packaging>application-assembly</packaging>
 
@@ -70,7 +70,6 @@
                                     <groupId>org.apache.roller</groupId>
                                     <artifactId>roller</artifactId>
                                     <type>zip</type>
-                                    <version>3.1-rc6</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch</outputDirectory>

Modified: geronimo/plugins/roller/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-tomcat/pom.xml?view=diff&rev=556296&r1=556295&r2=556296
==============================================================================
--- geronimo/plugins/roller/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/roller-tomcat/pom.xml Sat Jul 14 09:43:00 2007
@@ -18,24 +18,24 @@
 
 <!-- $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.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>roller-tomcat</artifactId>
-    <version>2.0-SNAPSHOT</version>
     <name>Geronimo Plugins :: Roller for Tomcat</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
 
         <dependency>
@@ -46,53 +46,48 @@
         </dependency>
 
         <!-- Cant find out howto get ridd of this dependancy have to use one of the two
below -->
-<!-- 
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>roller-derby-database</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
- -->        
-           
+        <!--
+               <dependency>
+                   <groupId>org.apache.geronimo.plugins</groupId>
+                   <artifactId>roller-derby-database</artifactId>
+                   <version>${pom.version}</version>
+                   <type>car</type>
+               </dependency>
+        -->
+
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>roller-mysql-database</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-                            
-<!-- 
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>   
-
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.2.3</version>
-        </dependency>
 
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate</artifactId>
-            <version>3.0.5</version>
-        </dependency>   
---> 
+        <!--
+                <dependency>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </dependency>
+
+                <dependency>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache</artifactId>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate</artifactId>
+                </dependency>
+        -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
-            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-       
+
     </dependencies>
-    
 
-    
+
     <build>
         <resources>
             <resource>
@@ -100,12 +95,11 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <version>${pom.version}</version>
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
@@ -113,14 +107,13 @@
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>geronimo-roller-war</artifactId>
-            <version>${pom.version}</version>
-                       <type>war</type>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-roller-war</artifactId>
+                        <type>war</type>
                     </module>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml?view=diff&rev=556296&r1=556295&r2=556296
==============================================================================
--- geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml Sat Jul 14 09:43:00 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
 
   <environment>
     <hidden-classes>
@@ -37,12 +37,9 @@
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
-        <reference name="LoginService">
-            <name>JaasLoginService</name>
-        </reference>
         <xml-reference name="LoginModuleConfiguration">
-            <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
-                <log:login-module control-flag="REQUIRED" server-side="true" wrap-principals="false">
+            <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>

Modified: geronimo/plugins/roller/roller-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-war/pom.xml?view=diff&rev=556296&r1=556295&r2=556296
==============================================================================
--- geronimo/plugins/roller/roller-war/pom.xml (original)
+++ geronimo/plugins/roller/roller-war/pom.xml Sat Jul 14 09:43:00 2007
@@ -26,28 +26,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>roller-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>geronimo-roller-war</artifactId>
-    <version>2.0-SNAPSHOT</version>
     <name>Geronimo Configs :: Roller war repackaging from tgz</name>
     <packaging>application-assembly</packaging>
 
     <dependencies>
-<!--
-        <dependency>
-            <groupId>org.apache.roller</groupId>
-            <artifactId>roller</artifactId>
-            <version>3.1-rc6</version>
-            <classifier>bin</classifier>
-            <type>zip</type>
-        </dependency>
--->
-
     </dependencies>
 
     <build>
@@ -70,14 +60,13 @@
                                     <groupId>org.apache.roller</groupId>
                                     <artifactId>roller</artifactId>
                                     <type>zip</type>
-                                    <version>3.1-rc6</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.roller</groupId>
                                     <artifactId>required-jars-roller</artifactId>
                                     <type>zip</type>
                                     <version>3.1</version>
-                                </artifactItem>                                
+                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch</outputDirectory>
                         </configuration>
@@ -104,21 +93,6 @@
                     </execution>
                 </executions>
             </plugin>
-<!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webXml>${pom.basedir}/target/scratch/apache-roller-3.1/webapp/roller/WEB-INF/web.xml</webXml>
-                    <archiveClasses>false</archiveClasses>
-                    <webResources>
-                        <resource>
-                             <directory>target/scratch/apache-roller-3.1/webapp/roller</directory>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
--->
        </plugins>
     </build>
 



Mime
View raw message