geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r566186 - in /geronimo/sandbox/portals/plugins: console/trunk/console-jetty/src/main/resources/META-INF/ console/trunk/console-tomcat/src/main/resources/META-INF/ plancreator/trunk/ plancreator/trunk/plancreator-jetty/ plancreator/trunk/pla...
Date Wed, 15 Aug 2007 14:25:14 GMT
Author: pmcmahan
Date: Wed Aug 15 07:25:12 2007
New Revision: 566186

URL: http://svn.apache.org/viewvc?view=rev&rev=566186
Log:
GERONIMO-3413 plancreator plugin for jetty
remove reference to Roller plugin from copied geronimo-plugin.xml files

Added:
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/
      - copied from r566146, geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/
Modified:
    geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/pom.xml
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=566186&r1=566185&r2=566186
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml
Wed Aug 15 07:25:12 2007
@@ -35,9 +35,9 @@
         <id>org.apache.geronimo.configs/jetty6/2.1-SNAPSHOT/car</id>
         <resource-type>Web Container</resource-type>
         <description>
-            This version of the Roller application works with the Geronimo/Jetty distribution.
+            This version of the plugin works with the Geronimo/Jetty distribution.
             It is not intended to run in the Geronimo/Tomcat distribution.
-            There is a separate version of the Roller application that works with Tomcat.
+            There is a separate version of this plugin that works with Tomcat.
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=566186&r1=566185&r2=566186
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Wed Aug 15 07:25:12 2007
@@ -35,9 +35,9 @@
         <id>org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car</id>
         <resource-type>Web Container</resource-type>
         <description>
-            This version of the Roller application works with the Geronimo/Tomcat distribution.
+            This version of the plugin works with the Geronimo/Tomcat distribution.
             It is not intended to run in the Geronimo/Jetty distribution.
-            There is a separate version of the Roller application that works with Jetty.
+            There is a separate version of this plugin that works with Jetty.
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>

Modified: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/pom.xml?view=diff&rev=566186&r1=566146&r2=566186
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/pom.xml Wed Aug 15
07:25:12 2007
@@ -30,8 +30,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>plancreator-tomcat</artifactId>
-    <name>Geronimo Plan Creator :: Configuration for Tomcat</name>
+    <artifactId>plancreator-jetty</artifactId>
+    <name>Geronimo Plan Creator :: Configuration for Jetty</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -94,7 +94,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=566186&r1=566146&r2=566186
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/main/resources/META-INF/geronimo-plugin.xml
Wed Aug 15 07:25:12 2007
@@ -19,11 +19,11 @@
 <!-- $Rev$ $Date$ -->
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-    <name>Plan Creator -- Tomcat</name>
-    <module-id>org.apache.geronimo.plugins/plancreator-tomcat/1.0-SNAPSHOT/car</module-id>
+    <name>Plan Creator -- Jetty</name>
+    <module-id>org.apache.geronimo.plugins/plancreator-jetty/1.0-SNAPSHOT/car</module-id>
     <category>Application</category>
     <description>
-       Geronimo Plan Creator for Tomcat
+       Geronimo Plan Creator for Jetty
     </description>
 
     <url>http://geronimo.apache.org/</url>
@@ -32,12 +32,12 @@
     <geronimo-version>2.1-SNAPSHOT</geronimo-version>
 
     <prerequisite>
-        <id>org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car</id>
+        <id>org.apache.geronimo.configs/jetty6/2.1-SNAPSHOT/car</id>
         <resource-type>Web Container</resource-type>
         <description>
-            This version of the Roller application works with the Geronimo/Tomcat distribution.
-            It is not intended to run in the Geronimo/Jetty distribution.
-            There is a separate version of the Roller application that works with Jetty.
+            This version of the plugin works with the Geronimo/Jetty distribution.
+            It is not intended to run in the Geronimo/Tomcat distribution.
+            There is a separate version of this application that works with Tomcat.
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>

Modified: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml?view=diff&rev=566186&r1=566146&r2=566186
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml
(original)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml
Wed Aug 15 07:25:12 2007
@@ -16,13 +16,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
     
     <!-- This is where the files are accessed from. (aka - portletContext) -->
     <context-root>/PlanCreator</context-root>
-
-    <!-- required for pluto cross context dispatches -->
-    <cross-context />
 
     <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">

Modified: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml?view=diff&rev=566186&r1=566185&r2=566186
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml Wed Aug
15 07:25:12 2007
@@ -80,7 +80,6 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-core</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=566186&r1=566185&r2=566186
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Wed Aug 15 07:25:12 2007
@@ -35,9 +35,9 @@
         <id>org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car</id>
         <resource-type>Web Container</resource-type>
         <description>
-            This version of the Roller application works with the Geronimo/Tomcat distribution.
+            This version of the plugin works with the Geronimo/Tomcat distribution.
             It is not intended to run in the Geronimo/Jetty distribution.
-            There is a separate version of the Roller application that works with Jetty.
+            There is a separate version of this plugin that works with Jetty.
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>

Modified: geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml?view=diff&rev=566186&r1=566185&r2=566186
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml Wed Aug 15 07:25:12 2007
@@ -353,9 +353,7 @@
             <modules>
                 <module>plancreator-portlets</module>
                 <module>plancreator-tomcat</module>
-<!--
                 <module>plancreator-jetty</module>
--->
             </modules>
         </profile>
     </profiles>



Mime
View raw message