geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r582884 [2/3] - in /geronimo/server/trunk: ./ plugins/ plugins/activemq/ plugins/activemq/activemq-jetty/ plugins/activemq/activemq-portlets/ plugins/activemq/activemq-tomcat/ plugins/console/ plugins/console/console-base-portlets/ plugins/...
Date Mon, 08 Oct 2007 16:58:29 GMT
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,16 +25,34 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-portal-driver</artifactId>
+    <name>Geronimo Plugins :: Administration Console Portal Driver</name>
     <packaging>war</packaging>
-    <name>Administration Console :: Pluto Portal Driver</name>
 
     <dependencies>
     
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-support</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-portal-driver</artifactId>
@@ -56,6 +74,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -63,6 +82,10 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml Mon Oct  8 09:58:21 2007
@@ -92,6 +92,22 @@
       <portlet context="/console-base" name="SystemModules"/>
     </page>
 
+    <page name="Applications/Application EARs" uri="/WEB-INF/themes/default-theme.jsp">
+      <portlet context="/console-base" name="EARModules"/>
+    </page>
+
+    <page name="Applications/EJB JARs" uri="/WEB-INF/themes/default-theme.jsp">
+      <portlet context="/console-base" name="EJBModules"/>
+    </page>
+
+    <page name="Applications/J2EE Connectors" uri="/WEB-INF/themes/default-theme.jsp">
+      <portlet context="/console-base" name="RARModules"/>
+    </page>
+
+    <page name="Applications/App Clients" uri="/WEB-INF/themes/default-theme.jsp">
+      <portlet context="/console-base" name="ClientModules"/>
+    </page>
+
     <page name="Applications/Plugins" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console-base" name="ImportExport"/>
     </page>

Modified: geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,13 +25,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>console-tomcat</artifactId>
-    <name>Administration Console :: Tomcat plugin</name>
+    <name>Geronimo Plugins :: Administration Console - Tomcat</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -47,27 +46,51 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>pluto-support</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.directwebremoting</groupId>
+            <artifactId>dwr</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -97,9 +120,6 @@
                     </module>
                     <category>Administration</category>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
@@ -116,8 +136,6 @@
                                     This version of the plugin works with the Geronimo/Tomcat distribution.
                                 </description>
                             </prerequisite>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Copied: geronimo/server/trunk/plugins/console/pom.xml (from r582837, geronimo/plugins/console/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/pom.xml?p2=geronimo/server/trunk/plugins/console/pom.xml&p1=geronimo/plugins/console/trunk/pom.xml&r1=582837&r2=582884&rev=582884&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/pom.xml Mon Oct  8 09:58:21 2007
@@ -23,56 +23,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.2</version>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>console</artifactId>
-    <name>Administration Console</name>
+    <name>Geronimo Plugins :: Administration Console</name>
     <packaging>pom</packaging>
 
-    <version>1.0-SNAPSHOT</version>
-
     <description>
         Geronimo administration console supporting dynamic extensions
     </description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/console/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/console/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/plugins/console/trunk</url>
-    </scm>
-
-    <properties>
-        <!--
-        NOTE: Project version, to be used instead of ${pom.version} since that
-              value magically changes when using SNAPSHOT versions.
-
-              This value *must* be kept in sync with the value of the <version>
-              element, and it will need to be changed manually before a release,
-              as the maven-release-plugin will not update this value.
-        -->
-        <version>1.0-SNAPSHOT</version>
-        <activemqVersion>4.1.1</activemqVersion>
-        <commonsFileUploadVersion>1.1.1</commonsFileUploadVersion>
-        <commonsIoVersion>1.1</commonsIoVersion>
-        <dwrVersion>2.0.1</dwrVersion>
-        <geronimoJmsSpecVersion>1.1</geronimoJmsSpecVersion>
-        <geronimoServletSpecVersion>1.1</geronimoServletSpecVersion>
-        <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
-        <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
-        <portletApiVersion>1.0</portletApiVersion>
-
-        <!-- deployers needed to create the CAR files -->
-        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
 
@@ -176,391 +140,17 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>${portletApiVersion}</version>
-            </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-connector</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-management</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deployment</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jms_1.1_spec</artifactId>
-                <version>${geronimoJmsSpecVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commonsIoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>${geronimoServletSpecVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-core</artifactId>
-                <version>${activemqVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>${commonsFileUploadVersion}</version>
-            </dependency>
-
-           <dependency>
-                <groupId>org.directwebremoting</groupId>
-                <artifactId>dwr</artifactId>
-                <version>${dwrVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-kernel</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-upgrade</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-converter</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-web-2.5-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-security-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-security</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deploy-jsr88</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>console-core</artifactId>
-                <version>${version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-connector</artifactId>
-                    </exclusion>
-
-                   <exclusion>
-                       <groupId>javax.portlet</groupId>
-                       <artifactId>portlet-api</artifactId>
-                   </exclusion>
-
-                   <exclusion>
-                       <groupId>org.apache.geronimo.modules</groupId>
-                       <artifactId>geronimo-deploy-jsr88</artifactId>
-                   </exclusion>
-
-                   <exclusion>
-                       <groupId>org.apache.geronimo.specs</groupId>
-                       <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                   </exclusion>
-                </exclusions>
-            </dependency>
-
-            <!-- for jspc maven plugin -->
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jee-specs</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-            <!-- for jspc maven plugin -->
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-taglib</artifactId>
-                <version>${plutoVersion}</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.geronimo.plugins</groupId>
-                    <artifactId>car-maven-plugin</artifactId>
-                    <version>${geronimoVersion}</version>
-                    <extensions>true</extensions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
-                </plugin>
-
-                <!--
-                FIXME: Should not configure war to assume jsp by default
-                -->
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.2</version>
-                    <configuration>
-                        <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
-                        <archiveClasses>true</archiveClasses>
-                        <archive>
-                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                        
-                        <!--
-                        HACK: Include legal files explicity, otherwise they will end up in the wrong path
-                              or in another jar file in the war.
-                        
-                        NOTE: targetPath is broken for webResources (as documented)
-                        -->
-                        <webResources>
-                            <resource>
-                                <directory>${project.build.outputDirectory}</directory>
-                                <includes>
-                                    <include>META-INF/LICENSE*</include>
-                                    <include>META-INF/NOTICE*</include>
-                                    <include>META-INF/DISCLAIMER*</include>
-                                </includes>
-                            </resource>
-                        </webResources>
-                    </configuration>
-                </plugin>
-
-
-                <plugin>
-                    <groupId>org.codehaus.mojo.jspc</groupId>
-                    <artifactId>jspc-maven-plugin</artifactId>
-                    <version>2.0-SNAPSHOT</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                 <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
-                            </configuration>
-                        </execution>
-                    </executions> 
-                    
-                    <!-- Use the Tomcat 6 JSP compiler, but with our custom Jasper version -->
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.codehaus.mojo.jspc</groupId>
-                            <artifactId>jspc-compiler-tomcat6</artifactId>
-                            <version>2.0-SNAPSHOT</version>
-                            <exclusions>
-                                <exclusion>
-                                    <groupId>org.apache.tomcat</groupId>
-                                    <artifactId>jasper</artifactId>
-                                </exclusion>
-                            </exclusions>
-                        </dependency>
-                         
-                        <dependency>
-                            <groupId>org.apache.tomcat</groupId>
-                            <artifactId>jasper</artifactId>
-                            <version>6.0.13-G543818</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.pluto</groupId>
-                    <artifactId>maven-pluto-plugin</artifactId>
-                    <version>${plutoVersion}</version>
-                </plugin>
-
-            </plugins>
-
-        </pluginManagement>
-
-        <plugins>
-            
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-
-                <executions>
-                    <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were copied -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were found -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <tagBase>https://svn.apache.org/repos/asf/geronimo/sandbox/portals/tags</tagBase>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <!--
-        NOTE: The default repositories are picked up by Genesis, but need to
-              specify where Genesis lives to pick it up  any additional repositories.
-        -->
-
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-
-    </repositories>
-
-    <distributionManagement>
-        <!--
-        NOTE: The repository and snapshotRepository are picked up from Genesis.
-        -->
-
-        <site>
-            <id>geronimo-website</id>
-            <url>scp://people.apache.org/www/geronimo.apache.org/maven/portals</url>
-        </site>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <modules>
-                <module>console-core</module>
-                <module>console-base-portlets</module>
-                <module>console-portal-driver</module>
-                <module>console-ear</module>
-                <module>console-tomcat</module>
-                <module>console-jetty</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>console-core</module>
+        <module>console-base-portlets</module>
+        <module>console-portal-driver</module>
+        <module>console-ear</module>
+        <module>console-tomcat</module>
+        <module>console-jetty</module>
+    </modules>
 
 </project>
 

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-jetty/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-jetty/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,13 +25,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>debugviews</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>debugviews-jetty</artifactId>
-    <name>Debug Views :: Jetty plugin</name>
+    <name>Geronimo Plugins :: Debug Views - Jetty</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -46,20 +45,28 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-jetty</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>dojo-jetty6</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -71,11 +78,13 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
@@ -86,6 +95,20 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.directwebremoting</groupId>
+            <artifactId>dwr</artifactId>
+        </dependency>
+
+        <!-- for jspc. why is this needed? -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
 
     </dependencies>
@@ -115,11 +138,8 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <category>Application</category>
+                    <category>Debug</category>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
@@ -136,8 +156,6 @@
                                     This version of the plugin works with the Geronimo/Jetty distribution.
                                 </description>
                             </prerequisite>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,16 +25,33 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>debugviews</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>debugviews-portlets</artifactId>
-    <name>Debug Views :: Admin Console Portlets</name>
+    <name>Geronimo Plugins :: Debug Views Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
 
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-taglib</artifactId>
+            <version>${plutoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-naming</artifactId>
@@ -44,23 +61,28 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-core</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.directwebremoting</groupId>
             <artifactId>dwr</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -78,6 +100,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
         
@@ -91,6 +114,16 @@
         <filtering>true</filtering>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+          <groupId>org.codehaus.mojo.jspc</groupId>
+          <artifactId>jspc-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+      </plugin>
+    </plugins>
   </build>
     
 </project>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java Mon Oct  8 09:58:21 2007
@@ -40,6 +40,7 @@
 import javax.management.j2ee.statistics.Stats;
 import javax.management.j2ee.statistics.TimeStatistic;
 
+import org.apache.geronimo.console.util.TimeUtils;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GAttributeInfo;
@@ -416,12 +417,12 @@
                         long count = tStat.getCount();
                         mbeanStat.add(new String[] { "Count",
                                 Long.toString(count) });
-                        Date maxTime = new Date(tStat.getMaxTime());
+                        String maxTime = TimeUtils.formatDuration(tStat.getMaxTime());
                         mbeanStat.add(new String[] { "Max Time",
-                                maxTime.toString() });
-                        Date minTime = new Date(tStat.getMinTime());
+                                maxTime });
+                        String minTime = TimeUtils.formatDuration(tStat.getMinTime());
                         mbeanStat.add(new String[] { "Min Time",
-                                minTime.toString() });
+                                minTime });
                         long totalTime = tStat.getTotalTime();
                         mbeanStat.add(new String[] { "Total Time",
                                 Long.toString(totalTime) });

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,17 +25,16 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>debugviews</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>debugviews-tomcat</artifactId>
-    <name>Debug Views :: Tomcat plugin</name>
+    <name>Geronimo Plugins :: Debug Views - Tomcat</name>
     <packaging>car</packaging>
 
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>debugviews-portlets</artifactId>
@@ -46,20 +45,28 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-tomcat</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>dojo-tomcat</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -71,11 +78,13 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
@@ -86,6 +95,12 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.directwebremoting</groupId>
+            <artifactId>dwr</artifactId>
         </dependency>
 
     </dependencies>
@@ -115,11 +130,8 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <category>Application</category>
+                    <category>Debug</category>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
@@ -136,8 +148,6 @@
                                     This version of the plugin works with the Geronimo/Tomcat distribution.
                                 </description>
                             </prerequisite>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Copied: geronimo/server/trunk/plugins/debugviews/pom.xml (from r582837, geronimo/plugins/debugviews/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/pom.xml?p2=geronimo/server/trunk/plugins/debugviews/pom.xml&p1=geronimo/plugins/debugviews/trunk/pom.xml&r1=582837&r2=582884&rev=582884&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/pom.xml Mon Oct  8 09:58:21 2007
@@ -23,319 +23,25 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.2</version>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>debugviews</artifactId>
-    <name>Debug Views</name>
+    <name>Geronimo Plugins :: Debug Views</name>
     <packaging>pom</packaging>
 
-    <version>1.0-SNAPSHOT</version>
-
     <description>
         Geronimo Debug Views 
     </description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/debugviews/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/debugviews/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk</url>
-    </scm>
-
-    <properties>
-        <!--
-        NOTE: Project version, to be used instead of ${pom.version} since that
-              value magically changes when using SNAPSHOT versions.
-
-              This value *must* be kept in sync with the value of the <version>
-              element, and it will need to be changed manually before a release,
-              as the maven-release-plugin will not update this value.
-        -->
-        <version>1.0-SNAPSHOT</version>
-        <consoleVersion>1.0-SNAPSHOT</consoleVersion>
-        <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
-        <geronimoServletSpecVersion>1.1</geronimoServletSpecVersion>
-        <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
-        <xbeanVersion>3.0.1</xbeanVersion>
-
-        <!-- deployers needed to create the CAR files -->
-        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-kernel</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-management</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.directwebremoting</groupId>
-                <artifactId>dwr</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>${geronimoServletSpecVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-naming</artifactId>
-                <version>${xbeanVersion}</version>
-            </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.configs</groupId>
-                <artifactId>dojo-jetty6</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>dojo-tomcat</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>console-core</artifactId>
-                <version>${consoleVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-connector</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>javax.portlet</groupId>
-                        <artifactId>portlet-api</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-deploy-jsr88</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.geronimo.plugins</groupId>
-                    <artifactId>car-maven-plugin</artifactId>
-                    <version>${geronimoVersion}</version>
-                    <extensions>true</extensions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
-                </plugin>
-
-                <!--
-                FIXME: Should not configure war to assume jsp by default
-                -->
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.2</version>
-                    <configuration>
-                        <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
-                        <archiveClasses>true</archiveClasses>
-                        <archive>
-                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                        
-                        <!--
-                        HACK: Include legal files explicity, otherwise they will end up in the wrong path
-                              or in another jar file in the war.
-                        
-                        NOTE: targetPath is broken for webResources (as documented)
-                        -->
-                        <webResources>
-                            <resource>
-                                <directory>${project.build.outputDirectory}</directory>
-                                <includes>
-                                    <include>META-INF/LICENSE*</include>
-                                    <include>META-INF/NOTICE*</include>
-                                    <include>META-INF/DISCLAIMER*</include>
-                                </includes>
-                            </resource>
-                        </webResources>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.pluto</groupId>
-                    <artifactId>maven-pluto-plugin</artifactId>
-                    <version>${plutoVersion}</version>
-                </plugin>
-
-            </plugins>
-
-        </pluginManagement>
-
-        <plugins>
-            
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-
-                <executions>
-                    <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were copied -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were found -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <tagBase>https://svn.apache.org/repos/asf/geronimo/sandbox/portals/tags</tagBase>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <!--
-        NOTE: The default repositories are picked up by Genesis, but need to
-              specify where Genesis lives to pick it up  any additional repositories.
-        -->
-
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-
-    </repositories>
-
-    <distributionManagement>
-        <!--
-        NOTE: The repository and snapshotRepository are picked up from Genesis.
-        -->
-
-        <site>
-            <id>geronimo-website</id>
-            <url>scp://people.apache.org/www/geronimo.apache.org/maven/portals</url>
-        </site>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <modules>
-                <module>debugviews-portlets</module>
-                <module>debugviews-tomcat</module>
-                <module>debugviews-jetty</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>debugviews-portlets</module>
+        <module>debugviews-tomcat</module>
+        <module>debugviews-jetty</module>
+    </modules>
 
 </project>
 

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-jetty/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-jetty/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,13 +25,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plancreator</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>plancreator-jetty</artifactId>
-    <name>Deployment Plan Creator :: Jetty plugin</name>
+    <name>Geronimo Plugins :: Deployment Plan Creator - Jetty</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -47,29 +46,57 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-jetty</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <!-- for jspc. why is this needed? -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
 
     </dependencies>
@@ -99,11 +126,8 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <category>Application</category>
+                    <category>Development tools</category>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
@@ -120,8 +144,6 @@
                                     This version of the plugin works with the Geronimo/Jetty distribution.
                                 </description>
                             </prerequisite>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,61 +25,87 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plancreator</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>plancreator-portlets</artifactId>
-    <name>Deployment Plan Creator :: Admin Console Portlets</name>
+    <name>Geronimo Plugins :: Deployment Plan Creator Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
 
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+            
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-taglib</artifactId>
+            <version>${plutoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web-2.5-builder</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-core</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -87,6 +113,12 @@
             <artifactId>portlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <scope>provided</scope>
+        </dependency>
         
     </dependencies>
     
@@ -98,6 +130,16 @@
         <filtering>true</filtering>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+          <groupId>org.codehaus.mojo.jspc</groupId>
+          <artifactId>jspc-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+      </plugin>
+    </plugins>
   </build>
     
 </project>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,13 +25,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plancreator</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>plancreator-tomcat</artifactId>
-    <name>Deployment Plan Creator :: Tomcat plugin</name>
+    <name>Geronimo Plugins :: Deployment Plan Creator - Tomcat</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -47,29 +46,49 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-tomcat</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <version>${version}</version>
         </dependency>
 
     </dependencies>
@@ -99,14 +118,11 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <category>Application</category>
+                    <category>Development tools</category>
                     <description>
                        Plan creator plugin for Tomcat
                     </description>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
@@ -123,8 +139,6 @@
                                     This version of the plugin works with the Geronimo/Tomcat distribution.
                                 </description>
                             </prerequisite>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Copied: geronimo/server/trunk/plugins/plancreator/pom.xml (from r582837, geronimo/plugins/plancreator/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/pom.xml?p2=geronimo/server/trunk/plugins/plancreator/pom.xml&p1=geronimo/plugins/plancreator/trunk/pom.xml&r1=582837&r2=582884&rev=582884&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/pom.xml Mon Oct  8 09:58:21 2007
@@ -23,340 +23,25 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.2</version>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>plancreator</artifactId>
-    <name>Deployment Plan Creator</name>
+    <name>Geronimo Plugins :: Deployment Plan Creator</name>
     <packaging>pom</packaging>
 
-    <version>1.0-SNAPSHOT</version>
-
     <description>
         Geronimo deployment plan creator
     </description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/plancreator/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/plancreator/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk</url>
-    </scm>
-
-    <properties>
-        <!--
-        NOTE: Project version, to be used instead of ${pom.version} since that
-              value magically changes when using SNAPSHOT versions.
-
-              This value *must* be kept in sync with the value of the <version>
-              element, and it will need to be changed manually before a release,
-              as the maven-release-plugin will not update this value.
-        -->
-        <version>1.0-SNAPSHOT</version>
-        <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
-        <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
-        <consoleVersion>1.0-SNAPSHOT</consoleVersion>
-
-        <!-- deployers needed to create the CAR files -->
-        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging-api</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-kernel</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</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-deployment</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-test-ddbean</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-naming-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-security-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-management</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-web-2.5-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deploy-jsr88</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>console-core</artifactId>
-                <version>${consoleVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-connector</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>javax.portlet</groupId>
-                        <artifactId>portlet-api</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-deploy-jsr88</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.geronimo.plugins</groupId>
-                    <artifactId>car-maven-plugin</artifactId>
-                    <version>${geronimoVersion}</version>
-                    <extensions>true</extensions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
-                </plugin>
-
-                <!--
-                FIXME: Should not configure war to assume jsp by default
-                -->
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.2</version>
-                    <configuration>
-                        <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
-                        <archiveClasses>true</archiveClasses>
-                        <archive>
-                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                        
-                        <!--
-                        HACK: Include legal files explicity, otherwise they will end up in the wrong path
-                              or in another jar file in the war.
-                        
-                        NOTE: targetPath is broken for webResources (as documented)
-                        -->
-                        <webResources>
-                            <resource>
-                                <directory>${project.build.outputDirectory}</directory>
-                                <includes>
-                                    <include>META-INF/LICENSE*</include>
-                                    <include>META-INF/NOTICE*</include>
-                                    <include>META-INF/DISCLAIMER*</include>
-                                </includes>
-                            </resource>
-                        </webResources>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.pluto</groupId>
-                    <artifactId>maven-pluto-plugin</artifactId>
-                    <version>${plutoVersion}</version>
-                </plugin>
-
-            </plugins>
-
-        </pluginManagement>
-
-        <plugins>
-            
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-
-                <executions>
-                    <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were copied -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were found -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <tagBase>https://svn.apache.org/repos/asf/geronimo/sandbox/portals/tags</tagBase>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <!--
-        NOTE: The default repositories are picked up by Genesis, but need to
-              specify where Genesis lives to pick it up  any additional repositories.
-        -->
-
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-
-    </repositories>
-
-    <distributionManagement>
-        <!--
-        NOTE: The repository and snapshotRepository are picked up from Genesis.
-        -->
-
-        <site>
-            <id>geronimo-website</id>
-            <url>scp://people.apache.org/www/geronimo.apache.org/maven/portals</url>
-        </site>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <modules>
-                <module>plancreator-portlets</module>
-                <module>plancreator-tomcat</module>
-                <module>plancreator-jetty</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>plancreator-portlets</module>
+        <module>plancreator-tomcat</module>
+        <module>plancreator-jetty</module>
+    </modules>
 
 </project>
 

Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-pluto</artifactId>
+    <name>Geronimo Plugins :: Geronimo Enablement for Pluto</name>
     <packaging>jar</packaging>
-    <name>Pluto Plugin :: Geronimo Enablement for Pluto</name>
 
     <dependencies>
     
@@ -53,6 +53,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>pluto-support</artifactId>
+    <name>Geronimo Plugins :: Pluto container support</name>
     <packaging>car</packaging>
-    <name>Pluto :: Container support plugin</name>
 
     <dependencies>
     
@@ -83,6 +83,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -144,19 +145,10 @@
                       for portlet applications that are shared across the web container.
                     </description>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <instance>
-                        <plugin-artifact>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message