You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/01/23 00:00:03 UTC
svn commit: r614367 [8/8] - in /geronimo/server/trunk: ./ applications/
applications/ca-helper/ca-helper-jetty/
applications/ca-helper/ca-helper-tomcat/
applications/ca-helper/geronimo-ca-helper/ applications/geronimo-uddi-db/
applications/mejb/ applic...
Modified: geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,40 +1,38 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>openjpa</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-persistence-jpa10</artifactId>
- <name>Geronimo Modules :: Persistence 3.0</name>
+ <name>Geronimo Plugins, OpenJPA :: Persistence 3.0</name>
<dependencies>
-
<!-- g-transaction, g-system come from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -43,7 +41,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-transformer</artifactId>
<version>${version}</version>
</dependency>
@@ -52,7 +50,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
</dependency>
-
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,23 +21,23 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>openjpa</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>openjpa</artifactId>
- <name>Geronimo Configs :: OpenJPA with dependencies</name>
+ <name>Geronimo Plugins, OpenJPA :: OpenJPA</name>
<packaging>car</packaging>
+
<description>
This module provides OpenJPA together with all its dependencies.
</description>
<dependencies>
-
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
@@ -70,7 +70,6 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,22 +21,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>openjpa</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>persistence-jpa10-deployer</artifactId>
- <name>Geronimo Configs :: Persistence Deployer</name>
+ <name>Geronimo Plugins, OpenJPA :: Deployer</name>
<packaging>car</packaging>
<description>Geronimo Persistence Unit deployer.</description>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
@@ -68,7 +67,6 @@
<!--<groupId>org.apache.geronimo.schema</groupId>-->
<!--<artifactId>geronimo-schema-jee_5</artifactId>-->
<!--</dependency>-->
-
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,23 +26,22 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>openjpa</artifactId>
- <name>Geronimo Plugins :: openjpa</name>
+ <name>Geronimo Plugins, OpenJPA</name>
<packaging>pom</packaging>
<description>
- openjpa plugin
+ OpenJPA plugin
</description>
<modules>
-<module>geronimo-openjpa</module>
-<module>geronimo-persistence-jpa10</module>
-<module>geronimo-persistence-jpa10-builder</module>
-<module>openjpa</module>
-<module>persistence-jpa10-deployer</module>
+ <module>geronimo-openjpa</module>
+ <module>geronimo-persistence-jpa10</module>
+ <module>geronimo-persistence-jpa10-builder</module>
+ <module>openjpa</module>
+ <module>persistence-jpa10-deployer</module>
</modules>
</project>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,13 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plancreator</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>plancreator-console-jetty</artifactId>
- <name>Geronimo Plugins :: Deployment Plan Creator - Jetty</name>
+ <name>Geronimo Plugins, Plan Creator :: Jetty</name>
<packaging>car</packaging>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
@@ -42,6 +40,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
@@ -49,6 +48,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plancreator-portlets</artifactId>
@@ -65,7 +65,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<version>${version}</version>
</dependency>
@@ -78,7 +78,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<version>${version}</version>
<type>car</type>
@@ -113,7 +113,6 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
</dependencies>
<build>
@@ -151,4 +150,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,13 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plancreator</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>plancreator-console-tomcat</artifactId>
- <name>Geronimo Plugins :: Deployment Plan Creator - Tomcat</name>
+ <name>Geronimo Plugins, Plan Creator :: Tomcat</name>
<packaging>car</packaging>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -42,6 +40,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
@@ -49,6 +48,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plancreator-portlets</artifactId>
@@ -65,7 +65,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<version>${version}</version>
</dependency>
@@ -78,7 +78,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<version>${version}</version>
<type>car</type>
@@ -105,7 +105,6 @@
<artifactId>console-core</artifactId>
<version>${version}</version>
</dependency>
-
</dependencies>
<build>
@@ -146,4 +145,5 @@
</plugin>
</plugins>
</build>
+
</project>
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=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,18 +26,16 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plancreator</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>plancreator-portlets</artifactId>
- <name>Geronimo Plugins :: Deployment Plan Creator Portlets</name>
+ <name>Geronimo Plugins, Plan Creator :: Portlets</name>
<packaging>war</packaging>
<dependencies>
-
<!-- for jspc maven plugin -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>jee-specs</artifactId>
<version>${version}</version>
<type>car</type>
@@ -53,7 +51,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<version>${version}</version>
<scope>provided</scope>
@@ -95,7 +93,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${version}</version>
<scope>provided</scope>
@@ -120,26 +118,30 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
-
- <!-- Build configuration -->
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <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>
-
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,17 +26,23 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>plancreator</artifactId>
- <name>Geronimo Plugins :: Deployment Plan Creator</name>
+ <name>Geronimo Plugins, Plan Creator</name>
<packaging>pom</packaging>
<description>
Geronimo deployment plan creator
</description>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>plancreator-portlets</module>
<module>plancreator-console-jetty</module>
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=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -21,20 +21,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>pluto</artifactId>
<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>Geronimo Plugins, Pluto :: Core</name>
<dependencies>
-
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-container</artifactId>
@@ -51,11 +48,10 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
-
</dependencies>
</project>
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=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -21,27 +21,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>pluto</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
<artifactId>pluto-support</artifactId>
- <name>Geronimo Plugins :: Pluto container support</name>
+ <name>Geronimo Plugins, Pluto :: Support</name>
<packaging>car</packaging>
<dependencies>
-
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-portal-driver</artifactId>
@@ -114,7 +113,6 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
-
</dependencies>
<build>
@@ -128,8 +126,8 @@
</deploymentConfigs>
<category>Portals</category>
<description>
- Pluto portal container support for Geronimo. This configuration provides the components
- for portlet applications that are shared across the web container.
+ Pluto portal container support for Geronimo. This configuration provides the components
+ for portlet applications that are shared across the web container.
</description>
<osiApproved>true</osiApproved>
<useMavenDependencies>
Modified: geronimo/server/trunk/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,11 +26,10 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>pluto</artifactId>
- <name>Geronimo Plugins :: Pluto</name>
+ <name>Geronimo Plugins, Pluto</name>
<packaging>pom</packaging>
<description>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Tue Jan 22 14:59:41 2008
@@ -33,24 +33,14 @@
<name>Geronimo Plugins</name>
<packaging>pom</packaging>
- <properties>
- <!-- This property is required by the car:package mojo -->
- <geronimoVersion>${version}</geronimoVersion>
- <gbeanDeployerBootstrap>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
- <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
- <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
- <clientDeployer>org.apache.geronimo.configs/client-deployer/${version}/car</clientDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${version}/car</connectorDeployer>
- <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${version}/car</openejbDeployer>
- <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</openejbcorbaDeployer>
- <axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
- <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
- <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${version}/car</axis2Deployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
- <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
- <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
- <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car</jpaDeployer>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<modules>
<module>activemq</module>
@@ -82,18 +72,6 @@
</modules>
<build>
- <!--
- NOTE: Don't add to extentions here, or JCL will freak out about multipule versions.
-
- <extensions>
- <extension>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <version>${version}</version>
- </extension>
- </extensions>
- -->
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,27 +23,26 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>system-database</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-derby</artifactId>
- <name>Geronimo Modules :: Derby</name>
+ <name>Geronimo Plugins, System Database :: Derby</name>
<description>Wrapper for using Apache Derby as a bundled database.</description>
<dependencies>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<version>${version}</version>
</dependency>
@@ -57,7 +56,6 @@
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
</dependency>
-
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/system-database/geronimo-timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-timer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-timer/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-timer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>system-database</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-timer</artifactId>
- <name>Geronimo Modules :: Timer</name>
+ <name>Geronimo Plugins, System Database :: Timer</name>
<properties>
<!--
Modified: geronimo/server/trunk/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,21 +15,35 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>system-database</artifactId>
- <name>Geronimo Plugins :: System Database</name>
+ <name>Geronimo Plugins, System Database</name>
<packaging>pom</packaging>
+
<description>
Geronimo System Database Plugin
</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>geronimo-derby</module>
<module>geronimo-timer</module>
@@ -38,4 +52,5 @@
<module>sysdb-console-jetty</module>
<module>sysdb-console-tomcat</module>
</modules>
+
</project>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,13 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>sysdb-console-jetty</artifactId>
- <name>Geronimo Plugins :: System Database - Jetty</name>
+ <name>Geronimo Plugins, System Database :: Console (Jetty)</name>
<packaging>car</packaging>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
@@ -42,6 +40,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
@@ -49,6 +48,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>sysdb-portlets</artifactId>
@@ -85,14 +85,14 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
@@ -104,13 +104,13 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<version>${version}</version>
<type>car</type>
@@ -227,7 +227,6 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
</dependencies>
<build>
@@ -265,4 +264,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,13 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>sysdb-console-tomcat</artifactId>
- <name>Geronimo Plugins :: System Database - Tomcat</name>
+ <name>Geronimo Plugins, System Database :: Console (Tomcat)</name>
<packaging>car</packaging>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -42,6 +40,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
@@ -49,6 +48,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>sysdb-portlets</artifactId>
@@ -85,14 +85,14 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
@@ -104,13 +104,13 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<version>${version}</version>
<type>car</type>
@@ -214,7 +214,6 @@
<groupId>org.directwebremoting</groupId>
<artifactId>dwr</artifactId>
</dependency>
-
</dependencies>
<build>
@@ -252,4 +251,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,18 +26,16 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>sysdb-portlets</artifactId>
- <name>Geronimo Plugins :: System Database Portlets</name>
+ <name>Geronimo Plugins, System Database :: Portlets</name>
<packaging>war</packaging>
<dependencies>
-
<!-- for jspc maven plugin -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>jee-specs</artifactId>
<version>${version}</version>
<type>car</type>
@@ -67,7 +65,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
<scope>provided</scope>
@@ -88,7 +86,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<version>${version}</version>
<scope>provided</scope>
@@ -101,7 +99,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${version}</version>
<scope>provided</scope>
@@ -124,27 +122,25 @@
<artifactId>commons-fileupload</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
- <!-- Build configuration -->
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <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>
-
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <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/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,24 +21,23 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>system-database</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
- <name>Geronimo Configs :: System Database</name>
+ <name>Geronimo Plugins, System Database :: System Database</name>
<packaging>car</packaging>
<description>
- System database plugin for geronimo. This provides system databse together with its dependencies as one dependency.
+ System database plugin for geronimo. This provides system databse together with its dependencies as one dependency.
</description>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -23,17 +23,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>tomcat</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat6-builder</artifactId>
- <name>Geronimo Modules :: Tomcat :: Builder</name>
+ <name>Geronimo Plugins, Tomcat :: Builder</name>
<dependencies>
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-tomcat6</artifactId>
@@ -91,13 +90,12 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,21 +16,21 @@
limitations under the License.
-->
-<!-- $Rev: 598023 $ $Date: 2007-11-26 05:08:16 +1100 (Mon, 26 Nov 2007) $ -->
+<!-- $Rev: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 2007) $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>tomcat</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
- <name>Geronimo Modules :: Tomcat :: Clustering Builder for WADI</name>
+ <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI Core</name>
<dependencies>
<!-- xmlbeans, stax-api comes transitively via g-service-builder from this -->
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,21 +16,21 @@
limitations under the License.
-->
-<!-- $Rev: 598023 $ $Date: 2007-11-26 05:08:16 +1100 (Mon, 26 Nov 2007) $ -->
+<!-- $Rev: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 2007) $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>tomcat</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
- <name>Geronimo Modules :: Tomcat Clustering over WADI</name>
+ <name>Geronimo Plugins, Tomcat :: Clustering over WADI Core</name>
<dependencies>
<dependency>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>tomcat</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat6</artifactId>
- <name>Geronimo Modules :: Tomcat</name>
+ <name>Geronimo Plugins, Tomcat :: Core</name>
<dependencies>
<!-- g-transaction, g-system comes from this -->
@@ -41,7 +41,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${version}</version>
</dependency>
@@ -96,7 +96,6 @@
<groupId>org.apache.tomcat.extras</groupId>
<artifactId>juli-adapters</artifactId>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,21 +15,27 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>tomcat</artifactId>
- <name>Geronimo Plugins :: tomcat</name>
+ <name>Geronimo Plugins, Tomcat</name>
<packaging>pom</packaging>
+
<description>
- tomcat plugin
+ Tomcat plugin
</description>
+
<modules>
<module>geronimo-tomcat6</module>
<module>geronimo-tomcat6-builder</module>
@@ -40,4 +46,5 @@
<module>tomcat6-clustering-wadi</module>
<module>tomcat6-clustering-builder-wadi</module>
</modules>
+
</project>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,24 +16,25 @@
limitations under the License.
-->
-<!-- $Rev: 590960 $ $Date: 2007-11-01 21:37:09 +1100 (Thu, 01 Nov 2007) $ -->
+<!-- $Rev: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 2007) $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>tomcat</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-clustering-builder-wadi</artifactId>
- <name>Geronimo Configs :: Tomcat 6 :: Clustering Builder for WADI</name>
+ <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI</name>
<packaging>car</packaging>
<description>Deployment for WADI clustering on Tomcat 6.</description>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,21 +16,21 @@
limitations under the License.
-->
-<!-- $Rev: 574101 $ $Date: 2007-09-10 09:14:43 +1000 (Mon, 10 Sep 2007) $ -->
+<!-- $Rev: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 2007) $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>tomcat</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-clustering-wadi</artifactId>
- <name>Geronimo Configs :: Tomcat 6 Clustering over WADI</name>
+ <name>Geronimo Plugins, Tomcat :: Clustering over WADI</name>
<packaging>car</packaging>
<description>WADI clustering for Tomcat.</description>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,20 +23,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>tomcat</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
- <name>Geronimo Configs :: Tomcat Deployer</name>
+ <name>Geronimo Plugins, Tomcat :: Deployer</name>
<packaging>car</packaging>
<description>Geronimo deployer for Tomcat web container.</description>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
@@ -72,7 +71,6 @@
<artifactId>geronimo-web-2.5-builder</artifactId>
<version>${version}</version>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>tomcat</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6</artifactId>
- <name>Geronimo Configs :: Tomcat</name>
+ <name>Geronimo Plugins, Tomcat :: Tomcat</name>
<packaging>car</packaging>
<description>Geronimo Tomcat web server integration.</description>
@@ -44,7 +44,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>server-security-config</artifactId>
<version>${version}</version>
<type>car</type>
@@ -107,7 +107,6 @@
<groupId>org.apache.tomcat.extras</groupId>
<artifactId>juli-adapters</artifactId>
</dependency>
-
</dependencies>
<build>
@@ -197,6 +196,5 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,24 +16,23 @@
limitations under the License.
-->
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 2007) $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>webservices</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices-builder</artifactId>
- <name>Geronimo Modules :: Webservices :: Builder</name>
+ <name>Geronimo Plugins, Web Services :: Builder</name>
<dependencies>
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-webservices</artifactId>
@@ -66,7 +65,6 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,36 +23,36 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>webservices</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
- <name>Geronimo Modules :: Web Services</name>
+ <name>Geronimo Plugins, Web Services :: Core</name>
<dependencies>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-interceptor</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-core</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${version}</version>
</dependency>
@@ -110,7 +110,6 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,24 +15,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>webservices</artifactId>
- <name>Geronimo Plugins :: webservices</name>
+ <name>Geronimo Plugins, Web Services</name>
<packaging>pom</packaging>
+
<description>
webservices plugin
</description>
+
<modules>
<module>geronimo-webservices</module>
<module>geronimo-webservices-builder</module>
<module>webservices-common</module>
</modules>
+
</project>
Modified: geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,20 +23,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>webservices</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>webservices-common</artifactId>
- <name>Geronimo Configs :: WebServices Common</name>
+ <name>Geronimo Plugins, Web Services :: Common</name>
<packaging>car</packaging>
<description>Common classes for all web services provider integrations.</description>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
@@ -45,14 +44,14 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-security</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>xmlbeans</artifactId>
<version>${version}</version>
<type>car</type>
@@ -92,7 +91,6 @@
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jan 22 14:59:41 2008
@@ -60,7 +60,10 @@
as the maven-release-plugin will not update this value.
-->
<version>2.1-SNAPSHOT</version>
-
+
+ <!-- This property is required by the car:package mojo -->
+ <geronimoVersion>${version}</geronimoVersion>
+
<geronimoSchemaVersion>1.2</geronimoSchemaVersion>
<!--
@@ -95,8 +98,44 @@
<axiomVersion>1.2.5</axiomVersion>
<springVersion>2.0.5</springVersion>
<plutoVersion>1.2.0-G601060</plutoVersion>
+
+ <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
+ <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
+ <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
+ <clientDeployer>org.apache.geronimo.configs/client-deployer/${version}/car</clientDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${version}/car</connectorDeployer>
+ <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${version}/car</openejbDeployer>
+ <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</openejbcorbaDeployer>
+ <axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
+ <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
+ <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${version}/car</axis2Deployer>
+ <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
+ <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
+ <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
+ <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car</jpaDeployer>
+
+ <!-- Common plan properties -->
+ <PlanServerHostname>0.0.0.0</PlanServerHostname>
+ <PlanRemoteDeployHostname>127.0.0.1</PlanRemoteDeployHostname>
+ <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
+ <PlanHTTPPort>8080</PlanHTTPPort>
+ <PlanHTTPSPort>8443</PlanHTTPSPort>
+ <PlanAJPPort>8019</PlanAJPPort>
+ <PlanOpenEJBPort>4201</PlanOpenEJBPort>
+ <PlanNamingPort>1099</PlanNamingPort>
+ <PlanActiveMQPort>61616</PlanActiveMQPort>
+ <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
+ <PlanCOSNamingPort>1050</PlanCOSNamingPort>
+ <PlanCOSSunNamingPort>1050</PlanCOSSunNamingPort>
+ <PlanORBHost>localhost</PlanORBHost>
+ <PlanORBPort>6882</PlanORBPort>
+ <PlanORBSunPort>6882</PlanORBSunPort>
+ <PlanORBSSLHost>localhost</PlanORBSSLHost>
+ <PlanORBSSLPort>2001</PlanORBSSLPort>
+ <PlanORBSunSSLPort>2001</PlanORBSunSSLPort>
+ <PlanJMXPort>9999</PlanJMXPort>
</properties>
-
+
<dependencyManagement>
<dependencies>
@@ -2304,7 +2343,6 @@
<module>assemblies</module>
</modules>
</profile>
-
<!--
NOTE: This profile is used to enable plugin prefixes for easy command-line usage, as in:
Modified: geronimo/server/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/repository/pom.xml (original)
+++ geronimo/server/trunk/repository/pom.xml Tue Jan 22 14:59:41 2008
@@ -27,7 +27,6 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>repository</artifactId>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Tue Jan 22 14:59:41 2008
@@ -28,19 +28,7 @@
<artifactId>jca-cms-war</artifactId>
<name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security WAR</name>
<packaging>war</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -59,4 +47,17 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml Tue Jan 22 14:59:41 2008
@@ -37,27 +37,31 @@
<version>${version}</version>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -50,7 +50,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
<scope>provided</scope>
@@ -62,7 +62,6 @@
<!--<artifactId>xercesImpl</artifactId>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
-
</dependencies>
<build>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml Tue Jan 22 14:59:41 2008
@@ -49,7 +49,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
<scope>provided</scope>
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Tue Jan 22 14:59:41 2008
@@ -17,19 +17,24 @@
specific language governing permissions and limitations
under the License.
-->
+
<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
+
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>testsuite</artifactId>
<name>Geronimo TestSuite</name>
<packaging>pom</packaging>
+
<description>
Geronimo integration testsuite. This contains 2 profiles, default and child.
The default profile is used by the top level suites directly under this. The child profile is used by the test poms under the suites.
@@ -39,6 +44,7 @@
The test poms under the suites should have this pom as their parent and set their relativePath appropriately
The test poms under the suites inherit an empty 'child' profile from here. But any other build executions within the test poms should all be inside a 'child' profile.
</description>
+
<dependencyManagement>
<!-- mainatain the versioning of all dependencies in this one common location here. -->
<dependencies>
Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml Tue Jan 22 14:59:41 2008
@@ -74,12 +74,11 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
<profiles>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -53,13 +53,13 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
</dependency>
@@ -69,7 +69,6 @@
<artifactId>jaxb-api</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -53,13 +53,13 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -45,13 +45,13 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -66,14 +66,14 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
<scope>provided</scope>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -52,13 +52,13 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/pom.xml (original)
+++ geronimo/server/trunk/testsupport/pom.xml Tue Jan 22 14:59:41 2008
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.testsupport</groupId>