geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r629932 - in /geronimo/plugins/roller/trunk: pom.xml roller-jetty/pom.xml roller-tomcat/pom.xml roller-weblogger-geronimo/pom.xml
Date Thu, 21 Feb 2008 18:56:46 GMT
Author: djencks
Date: Thu Feb 21 10:56:43 2008
New Revision: 629932

URL: http://svn.apache.org/viewvc?rev=629932&view=rev
Log:
expose contextPath for customization.  Exclude inaccessible documentation

Modified:
    geronimo/plugins/roller/trunk/pom.xml
    geronimo/plugins/roller/trunk/roller-jetty/pom.xml
    geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
    geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml

Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=629932&r1=629931&r2=629932&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Thu Feb 21 10:56:43 2008
@@ -31,6 +31,9 @@
     <name>Geronimo :: Roller:: Parent</name>
     <packaging>pom</packaging>
 
+    <!--  IMPORTANT NOTE
+    BEFORE RELEASING change the versions in the config-xml-content/gbean name in roller-jetty
and roller-tomcat poms
+    -->
     <properties>
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>2.1</geronimoVersion>

Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=629932&r1=629931&r2=629932&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Thu Feb 21 10:56:43 2008
@@ -35,8 +35,14 @@
     <name>Geronimo Plugins :: Roller for Jetty</name>
     <packaging>car</packaging>
     <description>Apache Roller is a full-featured, multi-user and group-blog server
suitable for blog sites large and small.
-                 This plugin provides Roller for the Geronimo/Jetty distribution.</description>

-
+        This plugin provides Roller for the Geronimo/Jetty distribution. You can set the
context path for roller
+        in var/config/config-substitutions.properties with the key RollerContextPath after
installation. Most other
+        customization can be done in var/roller-data/configs/roller-custom.properties.
+    </description>
+
+    <!--  IMPORTANT NOTE
+    BEFORE RELEASING change the versions in the config-xml-content/gbean name in roller-jetty
and roller-tomcat poms
+    -->
     <dependencies>
 
         <dependency>
@@ -377,8 +383,17 @@
                         <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>
+                            <config-xml-content server="default">
+                                <!--  IMPORTANT NOTE
+                                BEFORE RELEASING change the versions in the config-xml-content/gbean
name in roller-jetty and roller-tomcat poms
+                                -->
+                                <gbean name="org.apache.geronimo.plugins/roller-jetty/1.0-SNAPSHOT/car">
+                                    <attribute name="contextPath">${RollerContextPath}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="RollerContextPath">/roller</config-substitution>
                         </plugin-artifact>
-                    </instance>                      
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=629932&r1=629931&r2=629932&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Thu Feb 21 10:56:43 2008
@@ -31,12 +31,17 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <!--  IMPORTANT NOTE
+    BEFORE RELEASING change the versions in the config-xml-content/gbean name in roller-jetty
and roller-tomcat poms
+    -->
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>roller-tomcat</artifactId>
     <name>Geronimo Plugins :: Roller for Tomcat</name>
     <packaging>car</packaging>
     <description>Apache Roller is a full-featured, multi-user and group-blog server
suitable for blog sites large and small.
-        This plugin provides Roller for the Geronimo/Tomcat distribution.
+        This plugin provides Roller for the Geronimo/Tomcat distribution. You can set the
context path for roller
+        in var/config/config-substitutions.properties with the key RollerContextPath after
installation. Most other
+        customization can be done in var/roller-data/configs/roller-custom.properties.
     </description>
 
     <dependencies>
@@ -380,6 +385,15 @@
                         <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>
+                            <config-xml-content server="default">
+                                <!--  IMPORTANT NOTE
+                                BEFORE RELEASING change the versions in the config-xml-content/gbean
name in roller-jetty and roller-tomcat poms
+                                -->
+                                <gbean name="org.apache.geronimo.plugins/roller-tomcat/1.0-SNAPSHOT/car">
+                                    <attribute name="contextPath">${RollerContextPath}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="RollerContextPath">/roller</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml?rev=629932&r1=629931&r2=629932&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml Thu Feb 21 10:56:43 2008
@@ -63,8 +63,13 @@
                             <groupId>org.apache.roller</groupId>
                             <artifactId>roller-weblogger-z</artifactId>
                             <excludes>
+                                <!-- this probably isn't read.... but just in case -->
                                 <exclude>WEB-INF/classes/log4j.properties</exclude>
 
+                                <!-- exclude inaccessible documentation -->
+                                <exclude>roller-ui/docs/**</exclude>
+
+                                <!-- use geronimo dependencies rather than inclusion for
published artifacts -->
                                 <exclude>WEB-INF/lib/acegi-security-1.0.3.jar</exclude>
                                 <exclude>WEB-INF/lib/antlr-2.7.2.jar</exclude>
                                 <exclude>WEB-INF/lib/commons-beanutils-1.6.jar</exclude>



Mime
View raw message