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/10 20:51:12 UTC
svn commit: r574332 [2/2] - in /geronimo/plugins:
activemq/trunk/activemq-jetty/ activemq/trunk/activemq-tomcat/
console/trunk/ console/trunk/console-base-portlets/
console/trunk/console-core/ console/trunk/console-ear/
console/trunk/console-jetty/ con...
Modified: geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database-jetty</artifactId>
- <name>System Database :: Configuration for Jetty</name>
+ <name>System Database :: Jetty plugin</name>
<packaging>car</packaging>
<dependencies>
@@ -41,6 +41,7 @@
<artifactId>system-database-portlets</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -130,129 +131,34 @@
<module>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database-portlets</artifactId>
+ <version>${version}</version>
<type>war</type>
</module>
- <name>System Database -- Jetty</name>
- <category>Application</category>
- <description>
- System Database Views for Jetty
- </description>
- <url>http://geronimo.apache.org/</url>
- <author>The Apache Geronimo development community</author>
+ <category>Databases</category>
<osiApproved>true</osiApproved>
<geronimoVersions>
- <value>2.0.1</value>
<value>2.1-SNAPSHOT</value>
</geronimoVersions>
- <obsoletes>
- <moduleId>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>system-database-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.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <version>${tranqlVersion}</version>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <version>${tranqlVersion}</version>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-rar-configurer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${geronimoVersion}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${geronimoVersion}</version>
- <type>jar</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.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${geronimoVersion}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${geronimoVersion}</version>
- <type>jar</type>
- </dependency>
- </dependencies>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
<instance>
<plugin-artifact>
<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>
<source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
<source-repository>http://repo1.maven.org/maven2/</source-repository>
+ <!-- temporary repo for console-jetty dependency until snaps are deployed to the snapshot repo -->
+ <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
</parent>
<artifactId>system-database-portlets</artifactId>
- <name>Geronimo System Database :: Admin Console Portlets</name>
+ <name>System Database :: Admin Console Portlets</name>
<packaging>war</packaging>
<dependencies>
Modified: geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database-tomcat</artifactId>
- <name>System Database :: Configuration for Tomcat</name>
+ <name>System Database :: Tomcat plugin</name>
<packaging>car</packaging>
<dependencies>
@@ -41,6 +41,7 @@
<artifactId>system-database-portlets</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -130,129 +131,34 @@
<module>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database-portlets</artifactId>
+ <version>${version}</version>
<type>war</type>
</module>
- <name>System Database -- Tomcat</name>
<category>Application</category>
- <description>
- System Database Views 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>system-database-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.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <version>${tranqlVersion}</version>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <version>${tranqlVersion}</version>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-rar-configurer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${geronimoVersion}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${geronimoVersion}</version>
- <type>jar</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.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${geronimoVersion}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${geronimoVersion}</version>
- <type>jar</type>
- </dependency>
- </dependencies>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
<instance>
<plugin-artifact>
<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>
<source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
<source-repository>http://repo1.maven.org/maven2/</source-repository>
+ <!-- temporary repo for console-tomcat dependency until snaps are deployed to the snapshot repo -->
+ <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
</plugin-artifact>
</instance>
</configuration>