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 [3/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/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml Tue Jan 22 14:59:41 2008
@@ -34,9 +34,8 @@
<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>
@@ -44,19 +43,19 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
<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-util</artifactId>
<version>${version}</version>
</dependency>
@@ -97,24 +96,26 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
+
<dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
-
-
</dependencies>
<build>
@@ -138,12 +139,12 @@
-->
<classpath>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<version>${version}</version>
</element>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</element>
@@ -151,7 +152,7 @@
NOTE: geronimo-transformer needs to be on the system classpath to avoid a potential deadlock. See GERONIMO-3141.
-->
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-transformer</artifactId>
<version>${version}</version>
</element>
@@ -216,102 +217,102 @@
<geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.0.5</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.0.5</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>2.1-SNAPSHOT</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.91</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.91</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>2.1-SNAPSHOT</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>2.6.9</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>2.6.9</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>2.2.3</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
- <version>1.1</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
- <version>2.2.3</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>2.2.3</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.1</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.0</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.1</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>2.1-SNAPSHOT</version>
- <type>jar</type>
- <import>classes</import>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <type>jar</type>
+ <import>classes</import>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml Tue Jan 22 14:59:41 2008
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>maven-plugins</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.plugins.it</groupId>
@@ -37,32 +36,31 @@
<packaging>jar</packaging>
<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-service-builder</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
<version>${version}</version>
<!-- exclude transitive deps -->
<exclusions>
<exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-util</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
</exclusion>
</exclusions>
@@ -99,7 +97,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
</dependencies>
<build>
@@ -125,7 +122,7 @@
<import>classes</import>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<version>${version}</version>
<start>false</start>
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Tue Jan 22 14:59:41 2008
@@ -161,7 +161,7 @@
/**
* The default deployer module to be used when no other deployer modules are configured.
*
- * @parameter expression="org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car"
+ * @parameter expression="org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car"
* @required
* @readonly
*/
@@ -177,7 +177,7 @@
/**
* The name of the deployer which will be used to deploy the CAR.
*
- * @parameter expression="org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer"
+ * @parameter expression="org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer"
* @required
*/
private String deployerName = null;
Modified: geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml Tue Jan 22 14:59:41 2008
@@ -29,7 +29,7 @@
</parent>
<artifactId>geronimo-maven-plugin</artifactId>
- <name>Geronimo Build Support, Geronimo</name>
+ <name>Geronimo Build Support :: Geronimo</name>
<packaging>maven-plugin</packaging>
<description>
@@ -40,13 +40,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml Tue Jan 22 14:59:41 2008
@@ -29,7 +29,7 @@
</parent>
<artifactId>geronimo-archetype-testsuite</artifactId>
- <name>Geronimo Build Support, Testsuite Archetype</name>
+ <name>Geronimo Build Support :: Testsuite Archetype</name>
<packaging>maven-plugin</packaging>
<description>Plugin to help create a testsuite</description>
Modified: geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml Tue Jan 22 14:59:41 2008
@@ -29,7 +29,7 @@
</parent>
<artifactId>testsuite-maven-plugin</artifactId>
- <name>Geronimo Build Support, Testsuite Plugin</name>
+ <name>Geronimo Build Support :: Testsuite Plugin</name>
<packaging>maven-plugin</packaging>
<description>Plugin to help Geronimo testsuite</description>
Modified: geronimo/server/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/components/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/components/pom.xml (original)
+++ geronimo/server/trunk/components/pom.xml Tue Jan 22 14:59:41 2008
@@ -14,7 +14,10 @@
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$ -->
+-->
+
+<!-- $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>
@@ -23,13 +26,21 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.modules</groupId>
+
+ <groupId>org.apache.geronimo.components</groupId>
<artifactId>components</artifactId>
- <name>Geronimo :: Component</name>
+ <name>Geronimo Components</name>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<modules>
<module>spring</module>
@@ -37,4 +48,39 @@
<module>upgrade</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <!-- Install as extention to allow 'car' packaging to be used. -->
+ <extensions>true</extensions>
+ <configuration>
+ <archive>
+ <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <osiApproved>true</osiApproved>
+ <!--
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ -->
+ <commonInstance>
+ <plugin-artifact>
+ <geronimo-version>${geronimoVersion}</geronimo-version>
+ <jvm-version>1.5</jvm-version>
+ <!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
+ <source-repository>~/.m2/repository/</source-repository>
+ <source-repository>http://repo1.maven.org/maven2/</source-repository>
+ <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+ <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+ </plugin-artifact>
+ </commonInstance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/server/trunk/components/spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/components/spring/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/components/spring/pom.xml (original)
+++ geronimo/server/trunk/components/spring/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.components</groupId>
+ <artifactId>components</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>spring</artifactId>
- <name>Geronimo Configs :: Spring</name>
+ <name>Geronimo Components :: Spring</name>
<packaging>car</packaging>
<description>
@@ -38,16 +38,16 @@
</description>
<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.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>jee-specs</artifactId>
<version>${version}</version>
<type>car</type>
@@ -72,7 +72,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/components/transformer-agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/components/transformer-agent/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/components/transformer-agent/pom.xml (original)
+++ geronimo/server/trunk/components/transformer-agent/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,27 +23,26 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>components</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>transformer-agent</artifactId>
- <name>Geronimo Configs :: Transformer Agent</name>
+ <name>Geronimo Components :: Transformer Agent</name>
<packaging>car</packaging>
<description>Geronimo class transformer registry agent.</description>
<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>
-
</dependencies>
<build>
@@ -65,7 +64,7 @@
-->
<classpath>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-transformer</artifactId>
<version>${version}</version>
</element>
Modified: geronimo/server/trunk/components/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/components/upgrade/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/components/upgrade/pom.xml (original)
+++ geronimo/server/trunk/components/upgrade/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,31 +23,29 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>components</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>upgrade</artifactId>
- <name>Geronimo Configs :: Plan Upgrade</name>
+ <name>Geronimo Components :: Plan Upgrade</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>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-upgrade</artifactId>
<version>${version}</version>
</dependency>
-
</dependencies>
<build>
@@ -65,4 +63,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -33,28 +33,28 @@
<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.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
<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-util</artifactId>
<version>${version}</version>
</dependency>
@@ -84,18 +84,22 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
+
<dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
@@ -123,12 +127,12 @@
-->
<classpath>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<version>${version}</version>
</element>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</element>
@@ -136,7 +140,7 @@
NOTE: geronimo-transformer is on the system classpath to avoid a potential deadlock. See GERONIMO-3141.
-->
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-transformer</artifactId>
<version>${version}</version>
</element>
@@ -183,8 +187,8 @@
<instance>
<plugin-artifact>
<config-xml-content load="false"/>
- <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-system//car">org.apache.geronimo.configs/client-system/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-system/${version}/car">org.apache.geronimo.configs/client-system/${version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/${version}/car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
</plugin-artifact>
</instance>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,32 +23,31 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
- <name>Geronimo Framework, Configs :: GBean Deployer Boostrap version</name>
+ <name>Geronimo Framework, Configs :: GBean Deployer Boostrap</name>
<packaging>car</packaging>
<dependencies>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
<!-- needed by the plan -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<version>${version}</version>
</dependency>
@@ -61,7 +60,7 @@
<!-- jsr88 dconfigbean support base classes -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<version>${version}</version>
</dependency>
@@ -77,7 +76,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -37,47 +37,45 @@
</description>
<dependencies>
-
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>xmlbeans</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</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>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
@@ -89,7 +87,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
</deploymentConfigs>
- <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
+ <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
<useMavenDependencies>
@@ -97,14 +95,14 @@
</useMavenDependencies>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>xmlbeans</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
<type>jar</type>
@@ -112,27 +110,26 @@
<!-- needed by the plan -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${version}</version>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<version>${version}</version>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<version>${version}</version>
<type>car</type>
<import>classes</import>
</dependency>
-
</dependencies>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -36,34 +36,33 @@
<description>Basic Geronimo server security infrastructure</description>
<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>
+
<!-- parent -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>rmi-naming</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-jmx-remoting</artifactId>
<version>${version}</version>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -35,21 +35,20 @@
<description>Base geronimo server that sets up the kernel.</description>
<dependencies>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
<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-util</artifactId>
<version>${version}</version>
</dependency>
@@ -90,48 +89,55 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
+
<dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
</dependency>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
+
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
</dependency>
+
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
</dependency>
<!-- build order hint -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
@@ -144,7 +150,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
</deploymentConfigs>
- <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
+ <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<archive>
<manifestEntries>
@@ -161,12 +167,12 @@
-->
<classpath>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<version>${version}</version>
</element>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</element>
@@ -174,7 +180,7 @@
NOTE: geronimo-transformer needs to be on the system classpath to avoid a potential deadlock. See GERONIMO-3141.
-->
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-transformer</artifactId>
<version>${version}</version>
</element>
Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -125,23 +125,23 @@
<!-- WS API -->
<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </dependency>
-->
<!--
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
-->
<!-- JAXB Impl should not be here! -->
<!--
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -167,26 +167,26 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-jdbc</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-system</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
+
<!-- build order hint -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
@@ -198,7 +198,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
</deploymentConfigs>
- <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
+ <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<useMavenDependencies>
<value>false</value>
</useMavenDependencies>
@@ -206,7 +206,7 @@
<category>JavaEE</category>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-system</artifactId>
<type>car</type>
<import>classes</import>
@@ -317,7 +317,7 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-jdbc</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,19 +23,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
<artifactId>jsr88-cli</artifactId>
- <name>Geronimo Framework, Configs :: JSR88 CLI</name>
+ <name>Geronimo Framework, Configs :: JSR-88 CLI</name>
<packaging>car</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
<scope>runtime</scope>
@@ -43,43 +43,43 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
<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-util</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,50 +23,50 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
<artifactId>jsr88-deploymentfactory</artifactId>
- <name>Geronimo Framework, Configs :: JSR88 DeploymentFactory</name>
+ <name>Geronimo Framework, Configs :: JSR-88 DeploymentFactory</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.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-util</artifactId>
<version>${version}</version>
</dependency>
<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-deploy-jsr88</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<version>${version}</version>
</dependency>
@@ -116,12 +116,12 @@
-->
<classpath>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</element>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
<version>${version}</version>
</element>
Modified: geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/offline-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/offline-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/offline-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -35,21 +35,20 @@
<description>Offline deployer</description>
<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.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>online-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -35,46 +35,46 @@
<description>Geronimo Online Deployer</description>
<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.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
<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-util</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<version>${version}</version>
</dependency>
@@ -106,26 +106,31 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-plugin</artifactId>
<version>${version}</version>
</dependency>
+
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
+
<dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
@@ -153,12 +158,12 @@
-->
<classpath>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<version>${version}</version>
</element>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</element>
Modified: geronimo/server/trunk/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -36,43 +36,47 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>rmi-naming</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-plugin</artifactId>
<version>${version}</version>
</dependency>
<!-- not sure about this one - provides remote access -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
</dependency>
+
<!-- needed by geronimo-deploy-config -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>xmlbeans</artifactId>
<version>${version}</version>
<type>car</type>
@@ -88,7 +92,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
</deploymentConfigs>
- <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
+ <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
<useMavenDependencies>
<value>true</value>
Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Tue Jan 22 14:59:41 2008
@@ -28,50 +28,10 @@
<version>2.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
<name>Geronimo Framework, Configs</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>
- <!-- 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>
-
<modules>
<module>geronimo-gbean-deployer</module>
<module>geronimo-gbean-deployer-bootstrap</module>
@@ -92,18 +52,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/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -35,23 +35,23 @@
<description>Fundamental geronimo services including the plugin installer.</description>
<dependencies>
-
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-system</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>jee-specs</artifactId>
<version>${version}</version>
<type>car</type>
@@ -59,31 +59,31 @@
<!-- thread pool has management interface -->
<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.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-interceptor</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>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-util</artifactId>
<version>${version}</version>
</dependency>
@@ -92,7 +92,6 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
</dependency>
-
</dependencies>
<build>
@@ -104,7 +103,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
</deploymentConfigs>
- <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
+ <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
<useMavenDependencies>
<value>true</value>
Modified: geronimo/server/trunk/framework/configs/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/server-security-config/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/server-security-config/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -36,7 +36,7 @@
<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>
@@ -45,7 +45,7 @@
<!-- parent -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-security</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -33,34 +33,34 @@
<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.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
<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-util</artifactId>
<version>${version}</version>
</dependency>
@@ -97,7 +97,7 @@
-->
<classpath>
<element>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</element>
Modified: geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -33,9 +33,8 @@
<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>
@@ -67,17 +66,16 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-upgrade</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<version>${version}</version>
</dependency>
-
</dependencies>
<build>
@@ -100,4 +98,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/framework/configs/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/xmlbeans/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/xmlbeans/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/xmlbeans/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
@@ -37,14 +37,13 @@
</description>
<dependencies>
-
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-system</artifactId>
<version>${version}</version>
<type>car</type>
@@ -52,13 +51,12 @@
<!-- build order hint -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
@@ -70,14 +68,14 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
</deploymentConfigs>
- <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
+ <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<useMavenDependencies>
<value>false</value>
</useMavenDependencies>
<category>Geronimo Core</category>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-system</artifactId>
<type>car</type>
<import>classes</import>