geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r550529 - in /geronimo/plugins/roller: derby/ derby/src/main/resources/META-INF/ derby/src/plan/ roller-derby-resources/ roller-derby-resources/src/main/resources/META-INF/ roller-jetty/ roller-jetty/src/main/resources/META-INF/ roller-jett...
Date Mon, 25 Jun 2007 16:04:06 GMT
Author: djencks
Date: Mon Jun 25 09:04:05 2007
New Revision: 550529

URL: http://svn.apache.org/viewvc?view=rev&rev=550529
Log:
GERONIMO-2994 geronimo-roller plugin.  Applied  roller_g20_svn_070602.patch with some modifications
to make it work more  on my system.

Modified:
    geronimo/plugins/roller/derby/pom.xml
    geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/roller/derby/src/plan/plan.xml
    geronimo/plugins/roller/roller-derby-resources/pom.xml
    geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
    geronimo/plugins/roller/roller-jetty/pom.xml
    geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/roller/roller-jetty/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=550529&r1=550528&r2=550529
==============================================================================
--- geronimo/plugins/roller/derby/pom.xml (original)
+++ geronimo/plugins/roller/derby/pom.xml Mon Jun 25 09:04:05 2007
@@ -30,33 +30,37 @@
     
     <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>
     
     <dependencies>
         <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.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${version}</version>
+            <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>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>geronimo-roller-derby-resources</artifactId>
-            <version>${version}</version>
-            <type>jar</type>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -67,6 +71,7 @@
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
+                <version>${pom.version}</version>
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
@@ -76,6 +81,7 @@
                     <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/derby/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=550529&r1=550528&r2=550529
==============================================================================
--- geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/roller/derby/src/main/resources/META-INF/geronimo-plugin.xml Mon Jun
25 09:04:05 2007
@@ -31,5 +31,5 @@
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
 
-    <dependency>org.apache.geronimo.configs/system-database//car</dependency>
+    <dependency>org.apache.geronimo.configs/system-database/2.0-SNAPSHOT/car</dependency>
 </geronimo-plugin>

Modified: geronimo/plugins/roller/derby/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/derby/src/plan/plan.xml?view=diff&rev=550529&r1=550528&r2=550529
==============================================================================
--- geronimo/plugins/roller/derby/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/derby/src/plan/plan.xml Mon Jun 25 09:04:05 2007
@@ -40,7 +40,7 @@
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>
-    <gbean name="DaytraderResources" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+    <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">

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=550529&r1=550528&r2=550529
==============================================================================
--- geronimo/plugins/roller/roller-derby-resources/pom.xml (original)
+++ geronimo/plugins/roller/roller-derby-resources/pom.xml Mon Jun 25 09:04:05 2007
@@ -33,6 +33,7 @@
 
     <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>
 

Modified: geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties?view=diff&rev=550529&r1=550528&r2=550529
==============================================================================
--- geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
(original)
+++ geronimo/plugins/roller/roller-derby-resources/src/main/resources/META-INF/roller-custom.properties
Mon Jun 25 09:04:05 2007
@@ -1,6 +1,6 @@
 
-uploads.dir=/var/local/roller/roller_data/uploads
-search.index.dir=/var/local/roller/roller_data/search-index
+#uploads.dir=/var/local/roller/roller_data/uploads
+#search.index.dir=/var/local/roller/roller_data/search-index
 
 #---------------------------------
 # Database configuration settings

Modified: geronimo/plugins/roller/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-jetty/pom.xml?view=diff&rev=550529&r1=550528&r2=550529
==============================================================================
--- geronimo/plugins/roller/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/roller-jetty/pom.xml Mon Jun 25 09:04:05 2007
@@ -30,33 +30,26 @@
 
     <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>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>jetty6-deployer</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>geronimo-roller-war</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>roller-derby-database</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
             <type>car</type>
-        </dependency>   
-
+        </dependency>          
+ 
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
@@ -78,12 +71,15 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-deployer</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+       
     </dependencies>
     
+
+    
     <build>
         <resources>
             <resource>
@@ -96,6 +92,7 @@
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
+                <version>${pom.version}</version>
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
@@ -105,7 +102,7 @@
                     <module>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>geronimo-roller-war</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
                        <type>war</type>
                     </module>
                 </configuration>

Modified: geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=550529&r1=550528&r2=550529
==============================================================================
--- geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/roller/roller-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon
Jun 25 09:04:05 2007
@@ -32,7 +32,7 @@
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
 
     <prerequisite>
-        <id>org.apache.geronimo.configs/jetty6//car</id>
+        <id>org.apache.geronimo.configs/jetty6/2.0-SNAPSHOT/car</id>
         <resource-type>Web Container</resource-type>
         <description>
             This version of the Roller application works with the Geronimo/Jetty distribution.
@@ -41,8 +41,8 @@
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>
-    <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <dependency>org.apache.geronimo.plugins/roller-derby-database//car</dependency>
+    <dependency>org.apache.geronimo.configs/j2ee-server/2.0-SNAPSHOT/car</dependency>
+    <dependency>org.apache.geronimo.plugins/roller-derby-database/2.0-SNAPSHOT/car</dependency>
 <!--    <dependency>dom4j/dom4j/1.6.1/jar</dependency> 
 -->
 </geronimo-plugin>

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=550529&r1=550528&r2=550529
==============================================================================
--- geronimo/plugins/roller/roller-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-jetty/src/plan/plan.xml Mon Jun 25 09:04:05 2007
@@ -20,9 +20,19 @@
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
 
+  <environment>
+    <hidden-classes>
+        <filter>antlr</filter>
+        <filter>org.apache.commons.digester</filter>
+    </hidden-classes>
+  </environment>
+    
   <context-root>/roller</context-root>
     
-    <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">
+    <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>

Modified: geronimo/plugins/roller/roller-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-war/pom.xml?view=diff&rev=550529&r1=550528&r2=550529
==============================================================================
--- geronimo/plugins/roller/roller-war/pom.xml (original)
+++ geronimo/plugins/roller/roller-war/pom.xml Mon Jun 25 09:04:05 2007
@@ -33,6 +33,7 @@
 
     <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>
 
@@ -71,6 +72,12 @@
                                     <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>                                
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch</outputDirectory>
                         </configuration>
@@ -83,19 +90,16 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
-<!--
-                        <id>bin</id>
--->
                         <phase>package</phase>
                         <goals>
                             <goal>attached</goal>
                         </goals>
                         <configuration>
-                     <webXml>${pom.basedir}/target/scratch/apache-roller-3.1/webapp/roller/WEB-INF/web.xml</webXml>
-                    <archiveClasses>false</archiveClasses>
-                            <descriptors>
+                           <webXml>${pom.basedir}/target/scratch/apache-roller-3.1/webapp/roller/WEB-INF/web.xml</webXml>
+                           <archiveClasses>false</archiveClasses>
+                           <descriptors>
                                 <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
-                            </descriptors>
+                           </descriptors>
                         </configuration>
                     </execution>
                 </executions>



Mime
View raw message