geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r557049 - in /geronimo/plugins/roller: ./ roller-derby-database/src/plan/ roller-derby-resources/src/main/assembly/ roller-jetty/ roller-jetty/src/plan/ roller-mysql-database/src/plan/ roller-mysql-resources/src/main/assembly/ roller-tomcat...
Date Tue, 17 Jul 2007 20:32:01 GMT
Author: djencks
Date: Tue Jul 17 13:32:00 2007
New Revision: 557049

URL: http://svn.apache.org/viewvc?view=rev&rev=557049
Log:
with tweaks to roller, the jetty plugin works

Modified:
    geronimo/plugins/roller/pom.xml
    geronimo/plugins/roller/roller-derby-database/src/plan/plan.xml
    geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml
    geronimo/plugins/roller/roller-jetty/pom.xml
    geronimo/plugins/roller/roller-jetty/src/plan/plan.xml
    geronimo/plugins/roller/roller-mysql-database/src/plan/plan.xml
    geronimo/plugins/roller/roller-mysql-resources/src/main/assembly/bin.xml
    geronimo/plugins/roller/roller-tomcat/pom.xml
    geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml
    geronimo/plugins/roller/roller-war/pom.xml
    geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml

Modified: geronimo/plugins/roller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/pom.xml?view=diff&rev=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/pom.xml (original)
+++ geronimo/plugins/roller/pom.xml Tue Jul 17 13:32:00 2007
@@ -42,6 +42,7 @@
         <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>
+        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car</jpaDeployer>
     </properties>
 
     <dependencyManagement>
@@ -50,7 +51,7 @@
                 <groupId>org.apache.roller</groupId>
                 <artifactId>roller</artifactId>
                 <type>zip</type>
-                <version>3.1-rc6</version>
+                <version>4.0-dev</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
@@ -58,6 +59,12 @@
                 <version>2.0-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>javamail</artifactId>
+                <version>2.0-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
 
             <dependency>
                 <groupId>org.tranql</groupId>
@@ -76,21 +83,21 @@
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>connector-deployer</artifactId>
-                <version>${pom.version}</version>
+                <version>2.0-SNAPSHOT</version>
                 <type>car</type>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>jetty6-deployer</artifactId>
-                <version>${pom.version}</version>
+                <version>2.0-SNAPSHOT</version>
                 <type>car</type>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>tomcat6-deployer</artifactId>
-                <version>${pom.version}</version>
+                <version>2.0-SNAPSHOT</version>
                 <type>car</type>
                 <scope>provided</scope>
             </dependency>

Modified: geronimo/plugins/roller/roller-derby-database/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-derby-database/src/plan/plan.xml?view=diff&rev=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-derby-database/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-derby-database/src/plan/plan.xml Tue Jul 17 13:32:00 2007
@@ -37,6 +37,20 @@
                         </single-pool>
                     </connectionmanager>
                 </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <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>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>10</max-size>
+                            <min-size>0</min-size>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>

Modified: geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml?view=diff&rev=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml (original)
+++ geronimo/plugins/roller/roller-derby-resources/src/main/assembly/bin.xml Tue Jul 17 13:32:00
2007
@@ -31,7 +31,7 @@
     <fileSets>
 
         <fileSet>
-            <directory>target/scratch/apache-roller-3.1/webapp/roller/WEB-INF/dbscripts</directory>
+            <directory>target/scratch/apache-roller-4.0-dev/webapp/roller/WEB-INF/classes/dbscripts/</directory>
             <outputDirectory>META-INF</outputDirectory>
             <includes>
                 <include>derby/createdb.sql</include>

Modified: geronimo/plugins/roller/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-jetty/pom.xml?view=diff&rev=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/roller-jetty/pom.xml Tue Jul 17 13:32:00 2007
@@ -79,6 +79,11 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>javamail</artifactId>
+            <type>car</type>
+        </dependency>
 
     </dependencies>
 
@@ -100,6 +105,8 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>

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=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-jetty/src/plan/plan.xml Tue Jul 17 13:32:00 2007
@@ -20,18 +20,22 @@
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
 
-  <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" 
+    <environment>
+        <hidden-classes>
+            <filter>antlr</filter>
+            <filter>org.apache.commons.digester</filter>
+        </hidden-classes>
+    </environment>
+
+    <context-root>/roller</context-root>
+    <resource-ref>
+        <ref-name>mail/Session</ref-name>
+        <resource-link>mail/MailSession</resource-link>
+    </resource-ref>
+
+    <gbean name="roller" class="org.apache.geronimo.security.realm.GenericSecurityRealm"
+           xsi:type="dep:gbeanType"
+           xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <attribute name="realmName">roller</attribute>
         <reference name="ServerInfo">
@@ -41,8 +45,10 @@
             <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-2.0">
                 <log:login-module control-flag="REQUIRED" wrap-principals="false">
                     <log:login-domain-name>roller</log:login-domain-name>
-                    <log:login-module-class>org.apache.geronimo.security.realm.providers.SQLLoginModule</log:login-module-class>
-                    <log:option name="userSelect">SELECT username, passphrase FROM
rolleruser WHERE username=?</log:option>
+                    <log:login-module-class>org.apache.geronimo.security.realm.providers.SQLLoginModule
+                    </log:login-module-class>
+                    <log:option name="userSelect">SELECT username, passphrase FROM
rolleruser WHERE username=?
+                    </log:option>
                     <log:option name="dataSourceApplication">null</log:option>
                     <log:option name="groupSelect">SELECT username, rolename FROM userrole
WHERE username=?</log:option>
                     <log:option name="dataSourceName">jdbc/rollerdb</log:option>
@@ -50,5 +56,21 @@
             </log:login-config>
         </xml-reference>
     </gbean>
-    
+
+    <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+
+        <persistence-unit name="RollerPU">
+            <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+            <jta-data-source>jdbc/rollerdb</jta-data-source>
+            <non-jta-data-source>jdbc/NoTxrollerdb</non-jta-data-source>
+            <properties>
+                <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
+                <!--<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>-->
+                <property name="openjpa.jdbc.SynchronizeMappings" value=""/>
+                <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+            </properties>
+        </persistence-unit>
+
+    </persistence>
+
 </web-app>

Modified: geronimo/plugins/roller/roller-mysql-database/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-mysql-database/src/plan/plan.xml?view=diff&rev=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-mysql-database/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-mysql-database/src/plan/plan.xml Tue Jul 17 13:32:00 2007
@@ -39,6 +39,22 @@
                         </single-pool>
                     </connectionmanager>
                 </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <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>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>10</max-size>
+                            <min-size>0</min-size>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>

Modified: geronimo/plugins/roller/roller-mysql-resources/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-mysql-resources/src/main/assembly/bin.xml?view=diff&rev=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-mysql-resources/src/main/assembly/bin.xml (original)
+++ geronimo/plugins/roller/roller-mysql-resources/src/main/assembly/bin.xml Tue Jul 17 13:32:00
2007
@@ -31,7 +31,7 @@
     <fileSets>
 
         <fileSet>
-            <directory>target/scratch/apache-roller-3.1/webapp/roller/WEB-INF/dbscripts</directory>
+            <directory>target/scratch/apache-roller-4.0-dev/webapp/roller/WEB-INF/classes/dbscripts/</directory>
             <outputDirectory>META-INF</outputDirectory>
             <includes>
                 <include>mysql/createdb.sql</include>

Modified: geronimo/plugins/roller/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-tomcat/pom.xml?view=diff&rev=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/roller-tomcat/pom.xml Tue Jul 17 13:32:00 2007
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>roller-mysql-database</artifactId>
+            <artifactId>roller-derby-database</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
@@ -85,6 +85,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>javamail</artifactId>
+            <type>car</type>
+        </dependency>
+
     </dependencies>
 
 
@@ -105,6 +111,8 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>

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=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/roller/roller-tomcat/src/plan/plan.xml Tue Jul 17 13:32:00 2007
@@ -20,18 +20,22 @@
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
 
-  <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" 
+    <environment>
+        <hidden-classes>
+            <filter>antlr</filter>
+            <filter>org.apache.commons.digester</filter>
+        </hidden-classes>
+    </environment>
+
+    <context-root>/roller</context-root>
+
+    <resource-ref>
+        <ref-name>mail/Session</ref-name>
+        <resource-link>mail/MailSession</resource-link>
+    </resource-ref>
+    <gbean name="roller" class="org.apache.geronimo.security.realm.GenericSecurityRealm"
+           xsi:type="dep:gbeanType"
+           xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <attribute name="realmName">roller</attribute>
         <reference name="ServerInfo">
@@ -41,8 +45,10 @@
             <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-2.0">
                 <log:login-module control-flag="REQUIRED" wrap-principals="false">
                     <log:login-domain-name>roller</log:login-domain-name>
-                    <log:login-module-class>org.apache.geronimo.security.realm.providers.SQLLoginModule</log:login-module-class>
-                    <log:option name="userSelect">SELECT username, passphrase FROM
rolleruser WHERE username=?</log:option>
+                    <log:login-module-class>org.apache.geronimo.security.realm.providers.SQLLoginModule
+                    </log:login-module-class>
+                    <log:option name="userSelect">SELECT username, passphrase FROM
rolleruser WHERE username=?
+                    </log:option>
                     <log:option name="dataSourceApplication">null</log:option>
                     <log:option name="groupSelect">SELECT username, rolename FROM userrole
WHERE username=?</log:option>
                     <log:option name="dataSourceName">jdbc/rollerdb</log:option>
@@ -50,5 +56,21 @@
             </log:login-config>
         </xml-reference>
     </gbean>
+
+    <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+
+        <persistence-unit name="RollerPU">
+            <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+            <jta-data-source>jdbc/rollerdb</jta-data-source>
+            <non-jta-data-source>jdbc/NoTxrollerdb</non-jta-data-source>
+            <properties>
+                <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
+                <!--<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>-->
+                <property name="openjpa.jdbc.SynchronizeMappings" value=""/>
+                <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+            </properties>
+        </persistence-unit>
+
+    </persistence>
     
 </web-app>

Modified: geronimo/plugins/roller/roller-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-war/pom.xml?view=diff&rev=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-war/pom.xml (original)
+++ geronimo/plugins/roller/roller-war/pom.xml Tue Jul 17 13:32:00 2007
@@ -61,12 +61,12 @@
                                     <artifactId>roller</artifactId>
                                     <type>zip</type>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.roller</groupId>
-                                    <artifactId>required-jars-roller</artifactId>
-                                    <type>zip</type>
-                                    <version>3.1</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>
@@ -84,7 +84,7 @@
                             <goal>attached</goal>
                         </goals>
                         <configuration>
-                           <webXml>${pom.basedir}/target/scratch/apache-roller-3.1/webapp/roller/WEB-INF/web.xml</webXml>
+                           <webXml>${pom.basedir}/target/scratch/apache-roller-4.0-dev/webapp/roller/WEB-INF/web.xml</webXml>
                            <archiveClasses>false</archiveClasses>
                            <descriptors>
                                 <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>

Modified: geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml?view=diff&rev=557049&r1=557048&r2=557049
==============================================================================
--- geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml (original)
+++ geronimo/plugins/roller/roller-war/src/main/assembly/bin.xml Tue Jul 17 13:32:00 2007
@@ -31,7 +31,7 @@
     <fileSets>
 
         <fileSet>
-            <directory>target/scratch/apache-roller-3.1/webapp/roller</directory>
+            <directory>target/scratch/apache-roller-4.0-dev/webapp/roller</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>META-INF/**</exclude>



Mime
View raw message