geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r629716 - in /geronimo/plugins/roller/trunk: ./ roller-derby-database/src/main/plan/ roller-jetty/ roller-jetty/src/main/resources/ roller-jetty/src/main/resources/config/ roller-mysql-database/src/main/plan/ roller-resources/ roller-tomcat...
Date Thu, 21 Feb 2008 08:27:31 GMT
Author: djencks
Date: Thu Feb 21 00:27:27 2008
New Revision: 629716

URL: http://svn.apache.org/viewvc?rev=629716&view=rev
Log:
Use geronimo 2.1, put the customization property files in var/roller-data/config so people
can get at them

Added:
    geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/
    geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/
    geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/planet-custom.properties
      - copied unchanged from r619554, geronimo/plugins/roller/trunk/roller-resources/src/main/resources/planet-custom.properties
    geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties
      - copied, changed from r629667, geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties
    geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.vm
      - copied unchanged from r619552, geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.vm
    geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/
    geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/
    geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/planet-custom.properties
      - copied unchanged from r619554, geronimo/plugins/roller/trunk/roller-resources/src/main/resources/planet-custom.properties
    geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties
      - copied, changed from r629667, geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties
    geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.vm
      - copied unchanged from r619552, geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.vm
Removed:
    geronimo/plugins/roller/trunk/roller-resources/
Modified:
    geronimo/plugins/roller/trunk/pom.xml
    geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/plan.xml
    geronimo/plugins/roller/trunk/roller-jetty/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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=629716&r1=629715&r2=629716&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Thu Feb 21 00:27:27 2008
@@ -33,7 +33,7 @@
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>2.1</geronimoVersion>
 
         <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
@@ -96,25 +96,6 @@
                 <version>${geronimoVersion}</version>
                 <type>car</type>
             </dependency>
-            <!-- GERONIMO-3791 workaround for next 3 dependencies -->
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jasper</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jetty6</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>tomcat6</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
 
             <dependency>
                 <groupId>org.tranql</groupId>
@@ -571,7 +552,6 @@
     <modules>
         <module>roller-repository</module>
         <module>roller-weblogger-geronimo</module>
-        <module>roller-resources</module>
         <module>roller-derby-database</module>
         <!--
             The mysql connector jar dependency should not be needed to be downloaded by maven
(see optional flag)

Modified: geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/plan.xml?rev=629716&r1=629715&r2=629716&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/plan.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/src/main/plan/plan.xml Thu Feb 21
00:27:27 2008
@@ -54,4 +54,16 @@
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>
+
+    <gbean name="RollerSystemProperties"
+           class="org.apache.geronimo.system.properties.SystemProperties">
+        <attribute name="systemPathProperties">
+            roller.custom.config=var/roller-data/config/roller-custom.properties
+            planet.custom.config=var/roller-data/config/planet-custom.properties
+        </attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
 </connector>

Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=629716&r1=629715&r2=629716&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Thu Feb 21 00:27:27 2008
@@ -60,13 +60,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>roller-resources</artifactId>
-            <version>${version}</version>
-            <type>jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>roller-derby-database</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -383,6 +376,7 @@
                     <instance>
                         <plugin-artifact>
                             <copy-file relative-to="server" dest-dir="var/roller-data">themes</copy-file>
+                            <copy-file relative-to="server" dest-dir="var/roller-data">config</copy-file>
                         </plugin-artifact>
                     </instance>                      
                 </configuration>

Copied: geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties
(from r629667, geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties)
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties?p2=geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties&p1=geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties&r1=629667&r2=629716&rev=629716&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties
(original)
+++ geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties
Thu Feb 21 00:27:27 2008
@@ -28,7 +28,25 @@
 tasks.hourly=org.apache.roller.planet.tasks.RefreshEntriesTask
 
 # Daily Planet task: syncs weblog list with Roller, refreshes Technorati stats
-tasks.daily=org.apache.roller.planet.tasks.SyncWebsitesTask 
+tasks.daily=org.apache.roller.planet.tasks.SyncWebsitesTask
+
+#-----------------------------------------------------------------------------
+# Bookmark and category configuration
+#-----------------------------------------------------------------------------
+# list of links to include in root bookmark folder of each new blog
+# format is like so: linktitle2|linkurl2,linktitle2|linkurl2,linktitle3|linkurl3
+newuser.blogroll=\
+Dave Johnson|http://rollerweblogger.org/roller,\
+Matt Raible|http://raibledesigns.com/page/rd,\
+Lance Lavandowska|http://rollerweblogger.org/lance,\
+Henri Yandell|http://blog.generationjava.com/,\
+Elias Torres|http://torrez.us/,\
+Jeff Blattman|http://blogs.sun.com/jtb,\
+blogs.sun.com|http://blogs.sun.com,\
+jroller.com|http://jroller.com
+
+# comma-separated list of top-level categories to be created in each new weblog
+newuser.categories=General,Status,Java,Music,Politics
 
 #-----------------------------------------------------------------------------
 # Log4j logging settings

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=629716&r1=629715&r2=629716&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 Thu Feb 21
00:27:27 2008
@@ -54,13 +54,16 @@
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>
-    <!-- 
-    <gbean name="RollerMysqlResources" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
-        <attribute name="testSQL">select * from userrole where 1 = 2</attribute>
-        <attribute name="path">META-INF/mysql/createdb.sql</attribute>
-        <reference name="DataSource">
-            <name>jdbc/rollerdb</name>
+    
+    <gbean name="RollerSystemProperties"
+           class="org.apache.geronimo.system.properties.SystemProperties">
+        <attribute name="systemPathProperties">
+            roller.custom.config=var/roller-data/config/roller-custom.properties
+            planet.custom.config=var/roller-data/config/planet-custom.properties
+        </attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
         </reference>
     </gbean>
-     -->
+
 </connector>

Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=629716&r1=629715&r2=629716&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Thu Feb 21 00:27:27 2008
@@ -62,13 +62,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>roller-resources</artifactId>
-            <version>${version}</version>
-            <type>jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>roller-derby-database</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -386,6 +379,7 @@
                     <instance>
                         <plugin-artifact>
                             <copy-file relative-to="server" dest-dir="var/roller-data">themes</copy-file>
+                            <copy-file relative-to="server" dest-dir="var/roller-data">config</copy-file>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Copied: geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties
(from r629667, geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties)
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties?p2=geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties&p1=geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties&r1=629667&r2=629716&rev=629716&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-resources/src/main/resources/roller-custom.properties
(original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties
Thu Feb 21 00:27:27 2008
@@ -28,7 +28,25 @@
 tasks.hourly=org.apache.roller.planet.tasks.RefreshEntriesTask
 
 # Daily Planet task: syncs weblog list with Roller, refreshes Technorati stats
-tasks.daily=org.apache.roller.planet.tasks.SyncWebsitesTask 
+tasks.daily=org.apache.roller.planet.tasks.SyncWebsitesTask
+
+#-----------------------------------------------------------------------------
+# Bookmark and category configuration
+#-----------------------------------------------------------------------------
+# list of links to include in root bookmark folder of each new blog
+# format is like so: linktitle2|linkurl2,linktitle2|linkurl2,linktitle3|linkurl3
+newuser.blogroll=\
+Dave Johnson|http://rollerweblogger.org/roller,\
+Matt Raible|http://raibledesigns.com/page/rd,\
+Lance Lavandowska|http://rollerweblogger.org/lance,\
+Henri Yandell|http://blog.generationjava.com/,\
+Elias Torres|http://torrez.us/,\
+Jeff Blattman|http://blogs.sun.com/jtb,\
+blogs.sun.com|http://blogs.sun.com,\
+jroller.com|http://jroller.com
+
+# comma-separated list of top-level categories to be created in each new weblog
+newuser.categories=General,Status,Java,Music,Politics
 
 #-----------------------------------------------------------------------------
 # Log4j logging settings



Mime
View raw message