You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2007/09/04 23:05:16 UTC
svn commit: r572815 - in /geronimo/plugins/plancreator/trunk:
plancreator-jetty/ plancreator-jetty/src/main/plan/
plancreator-jetty/src/main/resources/ plancreator-jetty/src/plan/
plancreator-portlets/src/main/webapp/WEB-INF/ plancreator-tomcat/ plancr...
Author: pmcmahan
Date: Tue Sep 4 14:05:15 2007
New Revision: 572815
URL: http://svn.apache.org/viewvc?rev=572815&view=rev
Log:
GERONIMO-3413 use the car maven plugin to generate the geronimo-plugin.xml for the plan creator
Fix a bad url pattern in web.xml for the plan creator's portlet
Added:
geronimo/plugins/plancreator/trunk/plancreator-jetty/src/main/plan/
- copied from r568727, geronimo/plugins/plancreator/trunk/plancreator-jetty/src/plan/
geronimo/plugins/plancreator/trunk/plancreator-jetty/src/main/plan/plan.xml
- copied unchanged from r572813, geronimo/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml
geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/main/plan/
- copied from r568727, geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/plan/
geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/main/plan/plan.xml
- copied unchanged from r572813, geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml
Removed:
geronimo/plugins/plancreator/trunk/plancreator-jetty/src/main/resources/
geronimo/plugins/plancreator/trunk/plancreator-jetty/src/plan/
geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/
geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/plan/
Modified:
geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml
geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml
Modified: geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml?rev=572815&r1=572814&r2=572815&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml (original)
+++ geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml Tue Sep 4 14:05:15 2007
@@ -97,6 +97,93 @@
<artifactId>plancreator-portlets</artifactId>
<type>war</type>
</module>
+ <name>Plan Creator -- Jetty</name>
+ <module>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>plancreator-portlets</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </module>
+ <category>Application</category>
+ <description>
+ Plan Creator plugin for Jetty
+ </description>
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <osiApproved>true</osiApproved>
+ <geronimoVersions>
+ <value>2.0.1</value>
+ <value>2.1-SNAPSHOT</value>
+ </geronimoVersions>
+ <obsoletes>
+ <moduleId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>plancreator-jetty</artifactId>
+ </moduleId>
+ </obsoletes>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>pluto-support</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-test-ddbean</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ <prerequisites>
+ <prerequisite>
+ <id>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>pluto-support</artifactId>
+ </id>
+ <resource-type>Portal</resource-type>
+ <description>Pluto portal cantainer support in Geronimo</description>
+ </prerequisite>
+ <prerequisite>
+ <id>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ </id>
+ <resource-type>Web Container</resource-type>
+ <description>
+ 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 plugin that works with Tomcat.
+ Please install the version appropriate to your Geronimo distribution.
+ </description>
+ </prerequisite>
+ </prerequisites>
+ <sourceRepositories>
+ <value>http://people.apache.org/repo/m2-snapshot-repository/</value>
+ <value>http://repo1.maven.org/maven2/</value>
+ </sourceRepositories>
</configuration>
</plugin>
</plugins>
Modified: geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml?rev=572815&r1=572814&r2=572815&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml Tue Sep 4 14:05:15 2007
@@ -32,7 +32,7 @@
<servlet-mapping>
<servlet-name>PlanCreator</servlet-name>
- <url-pattern>/PlutoInvoker/plan-creator</url-pattern>
+ <url-pattern>/PlutoInvoker/PlanCreator</url-pattern>
</servlet-mapping>
<security-constraint>
Modified: geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml?rev=572815&r1=572814&r2=572815&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml (original)
+++ geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml Tue Sep 4 14:05:15 2007
@@ -97,6 +97,93 @@
<artifactId>plancreator-portlets</artifactId>
<type>war</type>
</module>
+ <name>Plan Creator -- Tomcat</name>
+ <module>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>plancreator-portlets</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </module>
+ <category>Application</category>
+ <description>
+ Plan Creator plugin for Tomcat
+ </description>
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <osiApproved>true</osiApproved>
+ <geronimoVersions>
+ <value>2.0.1</value>
+ <value>2.1-SNAPSHOT</value>
+ </geronimoVersions>
+ <obsoletes>
+ <moduleId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>plancreator-tomcat</artifactId>
+ </moduleId>
+ </obsoletes>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>pluto-support</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-test-ddbean</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ <prerequisites>
+ <prerequisite>
+ <id>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>pluto-support</artifactId>
+ </id>
+ <resource-type>Portal</resource-type>
+ <description>Pluto portal cantainer support in Geronimo</description>
+ </prerequisite>
+ <prerequisite>
+ <id>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ </id>
+ <resource-type>Web Container</resource-type>
+ <description>
+ 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 this plugin that works with Jetty.
+ Please install the version appropriate to your Geronimo distribution.
+ </description>
+ </prerequisite>
+ </prerequisites>
+ <sourceRepositories>
+ <value>http://people.apache.org/repo/m2-snapshot-repository/</value>
+ <value>http://repo1.maven.org/maven2/</value>
+ </sourceRepositories>
</configuration>
</plugin>
</plugins>