geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r573020 - in /geronimo/plugins/pluto/trunk: pluto-support/pom.xml pluto-support/src/main/plan/ pluto-support/src/main/plan/plan.xml pluto-support/src/main/resources/ pluto-support/src/plan/ pom.xml
Date Wed, 05 Sep 2007 18:17:04 GMT
Author: pmcmahan
Date: Wed Sep  5 11:17:03 2007
New Revision: 573020

URL: http://svn.apache.org/viewvc?rev=573020&view=rev
Log:
GERONIMO-3413 use the car maven plugin to generate the geronimo-plugin.xml for the pluto plugin

Added:
    geronimo/plugins/pluto/trunk/pluto-support/src/main/plan/
      - copied from r569722, geronimo/plugins/pluto/trunk/pluto-support/src/plan/
    geronimo/plugins/pluto/trunk/pluto-support/src/main/plan/plan.xml
      - copied unchanged from r573019, geronimo/plugins/pluto/trunk/pluto-support/src/plan/plan.xml
Removed:
    geronimo/plugins/pluto/trunk/pluto-support/src/main/resources/
    geronimo/plugins/pluto/trunk/pluto-support/src/plan/
Modified:
    geronimo/plugins/pluto/trunk/pluto-support/pom.xml
    geronimo/plugins/pluto/trunk/pom.xml

Modified: geronimo/plugins/pluto/trunk/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/pluto/trunk/pluto-support/pom.xml?rev=573020&r1=573019&r2=573020&view=diff
==============================================================================
--- geronimo/plugins/pluto/trunk/pluto-support/pom.xml (original)
+++ geronimo/plugins/pluto/trunk/pluto-support/pom.xml Wed Sep  5 11:17:03 2007
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>geronimo-pluto</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
@@ -134,8 +134,161 @@
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- Install as extention to allow 'car' packaging to be used. -->
-                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <name>Pluto Support for Geronimo</name>
+                    <module>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>pluto-support</artifactId>
+                        <version>${version}</version>
+                        <type>car</type>
+                    </module>
+                    <category>Portals</category>
+                    <url>http://geronimo.apache.org/</url>
+                    <author>The Apache development community</author>
+                    <description>
+                      Pluto portal container for Geronimo.  This configuration provides the
components
+                      for portal applications that are shared across the web container.
+                    </description>
+                    <osiApproved>true</osiApproved>
+                    <geronimoVersions>
+                        <value>2.0.1</value>
+                        <value>2.1-SNAPSHOT</value>
+                    </geronimoVersions>
+                    <obsoletes>
+                        <moduleId>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>pluto-support</artifactId>
+                        </moduleId>
+                    </obsoletes>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.pluto</groupId>
+                            <artifactId>pluto-portal-driver</artifactId>
+                            <version>${plutoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.pluto</groupId>
+                            <artifactId>pluto-portal-driver-impl</artifactId>
+                            <version>${plutoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.pluto</groupId>
+                            <artifactId>pluto-container</artifactId>
+                            <version>${plutoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.pluto</groupId>
+                            <artifactId>pluto-descriptor-api</artifactId>
+                            <version>${plutoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.pluto</groupId>
+                            <artifactId>pluto-descriptor-impl</artifactId>
+                            <version>${plutoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.pluto</groupId>
+                            <artifactId>pluto-taglib</artifactId>
+                            <version>${plutoVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>commons-logging</groupId>
+                            <artifactId>commons-logging-api</artifactId>
+                            <version>${commonsLoggingVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>commons-beanutils</groupId>
+                            <artifactId>commons-beanutils</artifactId>
+                            <version>${commonsBeanUtilsVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>commons-collections</groupId>
+                            <artifactId>commons-collections</artifactId>
+                            <version>${commonsCollectionsVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>javax.portlet</groupId>
+                            <artifactId>portlet-api</artifactId>
+                            <version>${portletApiVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jee-specs</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.codehaus.castor</groupId>
+                            <artifactId>castor</artifactId>
+                            <version>${castorVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>geronimo-pluto</artifactId>
+                            <version>${version}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-beans</artifactId>
+                            <version>${springVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-context</artifactId>
+                            <version>${springVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-core</artifactId>
+                            <version>${springVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-web</artifactId>
+                            <version>${springVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>commons-digester</groupId>
+                            <artifactId>commons-digester</artifactId>
+                            <version>${commonsDigesterVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                    </dependencies>
+                    <prerequisites>
+                        <prerequisite>
+                            <id>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>jasper</artifactId>
+                            </id>
+                            <resource-type>Web Container</resource-type>
+                            <description>The Jasper subsystem</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>
     </build>

Modified: geronimo/plugins/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/pluto/trunk/pom.xml?rev=573020&r1=573019&r2=573020&view=diff
==============================================================================
--- geronimo/plugins/pluto/trunk/pom.xml (original)
+++ geronimo/plugins/pluto/trunk/pom.xml Wed Sep  5 11:17:03 2007
@@ -55,10 +55,19 @@
               as the maven-release-plugin will not update this value.
         -->
         <version>1.0-SNAPSHOT</version>
+        <castorVersion>1.1.1</castorVersion>
+        <commonsBeanUtilsVersion>1.7.0</commonsBeanUtilsVersion>
+        <commonsCollectionsVersion>3.1</commonsCollectionsVersion>
+        <commonsDigesterVersion>1.8</commonsDigesterVersion>
+        <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
         <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
         <junitVersion>3.8.2</junitVersion>
         <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
+        <portletApiVersion>1.0</portletApiVersion>
         <springVersion>2.0.2</springVersion>
+
+        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
     </properties>
 
     <dependencyManagement>
@@ -185,25 +194,25 @@
             <dependency>
                 <groupId>javax.portlet</groupId>
                 <artifactId>portlet-api</artifactId>
-                <version>1.0</version>
+                <version>${portletApiVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>commons-digester</groupId>
                 <artifactId>commons-digester</artifactId>
-                <version>1.8</version>
+                <version>${commonsDigesterVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
-                <version>1.7.0</version>
+                <version>${commonsBeanUtilsVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging-api</artifactId>
-                <version>1.0.4</version>
+                <version>${commonsLoggingVersion}</version>
             </dependency>
 
             <dependency>
@@ -228,7 +237,7 @@
             <dependency>
                 <groupId>org.codehaus.castor</groupId>
                 <artifactId>castor</artifactId>
-                <version>1.1.1</version>
+                <version>${castorVersion}</version>
             </dependency>
 
             <dependency>
@@ -240,7 +249,7 @@
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
-                <version>3.1</version>
+                <version>${commonsCollectionsVersion}</version>
             </dependency>
 
             <dependency>



Mime
View raw message