Return-Path: 
 <scm-return-24483-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 3459 invoked from network); 22 Jan 2008 23:01:40 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 22 Jan 2008 23:01:40 -0000
Received: (qmail 86378 invoked by uid 500); 22 Jan 2008 23:01:30 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 86228 invoked by uid 500); 22 Jan 2008 23:01:29 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 86025 invoked by uid 99); 22 Jan 2008 23:01:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jan 2008 15:01:27 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jan 2008 23:01:06 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 696EB1A984D; Tue, 22 Jan 2008 15:01:13 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r614367 [4/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...
Date: Tue, 22 Jan 2008 23:00:03 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080122230113.696EB1A984D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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: 510485 $ $Date: 2007-02-23 00:02:44 +1100 (Fri, 23 Feb 2007) $ -->
+<!-- $Rev: 613699 $ $Date: 2008-01-20 14:50:35 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -34,7 +34,7 @@
     <dependencies>
 
         <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/framework/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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.
+    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.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -33,7 +33,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
             <exclusions>
@@ -70,8 +70,9 @@
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-cli</artifactId>
             <version>${version}</version>
             <exclusions>
@@ -81,8 +82,9 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-tool</artifactId>
             <version>${version}</version>
             <exclusions>

Modified: geronimo/server/trunk/framework/modules/geronimo-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-common/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-common/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-common/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -32,13 +32,11 @@
     <name>Geronimo Framework, Modules :: Common</name>
     
     <dependencies>
-        
         <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/framework/modules/geronimo-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-core/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-core/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-core/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -32,19 +32,17 @@
     <name>Geronimo Framework, Modules :: Core</name>
 
     <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>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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$ -->
@@ -23,13 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-deploy-config</artifactId>
-    <name>Geronimo Framework, Modules :: Deploy :: Common Config</name>
+    <name>Geronimo Framework, Modules :: Deploy Config</name>
     
     <description>
         The deployment module contains basic infrastructure and base classes for 
@@ -38,7 +38,6 @@
     </description>
     
     <dependencies>
-    
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
@@ -53,7 +52,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,18 +23,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
-    <name>Geronimo Framework, Modules :: Deploy :: JSR-88 Bootstrapper</name>
+    <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>
     
     <dependencies>
-
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
         </dependency>
@@ -43,7 +42,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
-        
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,33 +23,32 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-deploy-jsr88</artifactId>
-    <name>Geronimo Framework, Modules :: Deploy :: JSR-88</name>
+    <name>Geronimo Framework, Modules :: Deploy JSR-88</name>
     
     <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-plugin</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>
-        
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,16 +23,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-deploy-tool</artifactId>
-    <name>Geronimo Framework, Modules :: Deploy :: CLI Tool</name>
+    <name>Geronimo Framework, Modules :: Deploy Tool</name>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
@@ -40,19 +39,19 @@
 
         <!-- g-deployment comes from this -->
         <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-cli</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>
@@ -61,7 +60,6 @@
             <groupId>jline</groupId>
             <artifactId>jline</artifactId>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java Tue Jan 22 14:59:41 2008
@@ -43,7 +43,7 @@
  * @version $Rev: 476049 $ $Date: 2006-11-17 15:35:17 +1100 (Fri, 17 Nov 2006) $
  */
 public class OfflineDeployerStarter {
-    private static final Artifact OFFLINE_DEPLOYER_ARTIFACT = new Artifact("org.apache.geronimo.configs",
+    private static final Artifact OFFLINE_DEPLOYER_ARTIFACT = new Artifact("org.apache.geronimo.framework",
             "offline-deployer",
             (String) null,
             "car");

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -32,9 +32,8 @@
     <name>Geronimo Framework, Modules :: Deployment</name>
     
     <dependencies>
-        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>
         </dependency>
@@ -53,7 +52,6 @@
             <groupId>xml-resolver</groupId>
             <artifactId>xml-resolver</artifactId>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-interceptor/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-interceptor/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-interceptor/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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$ -->
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>

Modified: geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -32,15 +32,14 @@
     <name>Geronimo Framework, Modules :: J2EE</name>
     
     <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>
@@ -54,7 +53,6 @@
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-reflect</artifactId>
         </dependency>
-
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>

Modified: geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -36,13 +36,11 @@
     </description>
     
     <dependencies>
-        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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$ -->
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -109,20 +109,21 @@
             </plugin>
 
             <plugin>
-              <artifactId>maven-remote-resources-plugin</artifactId>
-              <executions>
-                <execution>
-                  <goals>
-                    <goal>process</goal>
-                  </goals>
-                  <configuration>
-                    <resourceBundles>
-                      <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
-                    </resourceBundles>
-                  </configuration>
-                </execution>
-              </executions>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>

Modified: geronimo/server/trunk/framework/modules/geronimo-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-management/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-management/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-management/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -36,9 +36,8 @@
     </description>
     
     <dependencies>
-    
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>
         </dependency>
@@ -47,7 +46,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -33,7 +33,7 @@
     
     <dependencies>
         <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/framework/modules/geronimo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml Tue Jan 22 14:59:41 2008
@@ -24,7 +24,7 @@
     
     <parent>
         <artifactId>modules</artifactId>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <version>2.1-SNAPSHOT</version>
     </parent>
     
@@ -32,15 +32,14 @@
     <name>Geronimo Framework, Modules :: Plugin</name>
     
     <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-kernel</artifactId>
             <version>${version}</version>
             <classifier>tests</classifier>
@@ -52,7 +51,6 @@
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-archiver</artifactId>
         </dependency>
-
     </dependencies>
 
     <!--

Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -34,20 +34,20 @@
     <dependencies>
         
         <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>
 
         <!-- g-system and g-management come from this -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -22,38 +22,36 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-service-builder</artifactId>
-    <name>Geronimo Framework, Modules :: Service :: Builder</name>
+    <name>Geronimo Framework, Modules :: Service Builder</name>
     
     <dependencies>
-
         <!-- g-kernel, g-common is coming from this via geronimo-system -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deployment</artifactId>
             <version>${version}</version>
         </dependency>
 
         <!-- required for environment dconfigbean support -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-config</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>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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.
+    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.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -33,31 +33,31 @@
 
     <dependencies>
         <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-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-kernel</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>
             <classifier>tests</classifier>
@@ -84,15 +84,16 @@
             <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>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java Tue Jan 22 14:59:41 2008
@@ -45,12 +45,12 @@
  *
  * To use, include something like this in the rmi-naming module of var/config/config.xml:
  *
- * <gbean name="org.apache.geronimo.configs/rmi-naming/2.1-SNAPSHOT/car?name=ConfiguredEncryption,j2eeType=GBean" gbeanInfo="org.apache.geronimo.system.util.ConfiguredEncryption">
+ * <gbean name="org.apache.geronimo.framework/rmi-naming/2.1-SNAPSHOT/car?name=ConfiguredEncryption,j2eeType=GBean" gbeanInfo="org.apache.geronimo.system.util.ConfiguredEncryption">
  * <attribute name="path">var/security/ConfiguredSecretKey.ser</attribute>
  * <reference name="ServerInfo"><pattern><name>ServerInfo</name></pattern></reference>
  * </gbean>
  *
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class ConfiguredEncryption extends AbstractEncryption implements GBeanLifecycle {
 

Modified: geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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$ -->
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>

Modified: geronimo/server/trunk/framework/modules/geronimo-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-upgrade/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-upgrade/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-upgrade/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -32,14 +32,12 @@
     <name>Geronimo Framework, Modules :: Upgrade</name>
     
     <dependencies>
-
         <!-- g-kernel, g-common come from this -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/modules/geronimo-util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-util/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-util/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-util/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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$ -->
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
@@ -32,12 +32,10 @@
     <name>Geronimo Framework, Modules :: Util</name>
     
     <dependencies>
-    
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Tue Jan 22 14:59:41 2008
@@ -28,19 +28,9 @@
         <version>2.1-SNAPSHOT</version>
     </parent>
     
-    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>modules</artifactId>
     <name>Geronimo Framework, Modules</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>geronimo-cli</module>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Tue Jan 22 14:59:41 2008
@@ -33,6 +33,15 @@
     <name>Geronimo Framework</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>modules</module>
         <module>configs</module>

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/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>activemq</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>activemq-broker</artifactId>
-    <name>Geronimo Configs :: ActiveMQ Broker</name>
+    <name>Geronimo Plugins, ActiveMQ :: Broker</name>
     <packaging>car</packaging>
 
     <description>Apache ActiveMQ integration into geronimo.  This module starts an activemq broker embedded in geronimo.</description>
     
     <dependencies>
-        
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -71,8 +70,8 @@
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
         </dependency>
-
     </dependencies>
+    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
 <?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
-
-  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.
+    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.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -26,15 +26,13 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
     <artifactId>activemq-console-jetty</artifactId>
-    <name>Geronimo Plugins :: ActiveMQ - Console - Jetty</name>
+    <name>Geronimo Plugins, ActiveMQ :: Console (Jetty)</name>
     <packaging>car</packaging>
 
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>activemq-portlets</artifactId>
@@ -64,7 +62,7 @@
         </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>
@@ -84,6 +82,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -91,20 +90,21 @@
             <type>car</type>
             <scope>provided</scope>
         </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-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>
@@ -131,7 +131,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -169,4 +168,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
 <?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
-
-  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.
+    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.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -26,15 +26,13 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
     <artifactId>activemq-console-tomcat</artifactId>
-    <name>Geronimo Plugins :: ActiveMQ - Console - Tomcat</name>
+    <name>Geronimo Plugins, ActiveMQ :: Console (Tomcat)</name>
     <packaging>car</packaging>
 
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>activemq-portlets</artifactId>
@@ -64,11 +62,12 @@
         </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.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
@@ -76,6 +75,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -92,19 +92,19 @@
         </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-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>
@@ -123,7 +123,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -161,4 +160,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,18 +26,16 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>activemq-portlets</artifactId>
-    <name>Geronimo Plugins :: ActiveMQ Portlets</name>
+    <name>Geronimo Plugins, ActiveMQ :: 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>
@@ -60,7 +58,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>
@@ -74,7 +72,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>
@@ -87,39 +85,37 @@
         </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>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
             <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/activemq/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-ra/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>activemq</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>activemq-ra</artifactId>
-    <name>Geronimo Configs :: ActiveMQ Resource Adapter</name>
+    <name>Geronimo Plugins, ActiveMQ :: Resource Adapter</name>
     <packaging>car</packaging>
 
     <description>Geronimo ActiveMQ integration: ActiveMQ resource adapter connecting to (embedded) activemq broker.</description>
     
     <dependencies>
-        
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -60,7 +59,6 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/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
@@ -6,9 +6,9 @@
     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
-   
+
+       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.
@@ -19,22 +19,22 @@
 <!-- $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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>activemq</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-activemq-management</artifactId>
-    <name>Geronimo Modules :: ActiveMQ Management Interfaces</name>
+    <name>Geronimo Plugins, ActiveMQ :: Management Interfaces</name>
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-management</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml Tue Jan 22 14:59:41 2008
@@ -6,9 +6,9 @@
     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.
@@ -19,18 +19,18 @@
 <!-- $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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>activemq</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-activemq-ra</artifactId>
-    <name>Geronimo Modules :: ActiveMQ Resource Adapter</name>
+    <name>Geronimo Plugins, ActiveMQ :: Resource Adapter Core</name>
     <packaging>rar</packaging>
     
     <description>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/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
@@ -6,9 +6,9 @@
     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
-   
+
+       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.
@@ -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>activemq</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-activemq</artifactId>
-    <name>Geronimo Modules :: ActiveMQ</name>
+    <name>Geronimo Plugins, ActiveMQ :: Core</name>
     
     <dependencies>
         <dependency>

Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,21 +15,34 @@
     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>activemq</artifactId>
-    <name>Geronimo Plugins :: ActiveMQ</name>
+    <name>Geronimo Plugins, ActiveMQ</name>
     <packaging>pom</packaging>
+    
     <description>
         ActiveMQ plugin
     </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+    </dependencies>
+    
     <modules>
         <module>activemq-broker</module>
         <module>geronimo-activemq-ra</module>
@@ -40,4 +53,5 @@
         <module>activemq-console-jetty</module>
         <module>activemq-console-tomcat</module>
     </modules>
+
 </project>

Modified: geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-deployer/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>axis</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>axis-deployer</artifactId>
-    <name>Geronimo Configs :: Axis Deployer</name>
+    <name>Geronimo Plugins, AXIS :: Deployer</name>
     <packaging>car</packaging>
 
     <description>Web Services Deployer for Geronimo Axis 1 integration</description>
@@ -70,7 +70,6 @@
             <artifactId>geronimo-webservices-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,20 +21,20 @@
 <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>axis</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>axis</artifactId>
-    <name>Geronimo Configs :: Axis</name>
+    <name>Geronimo Plugins, AXIS :: AXIS</name>
     <packaging>car</packaging>
 
     <description>Apache Axis 1 integration.</description>
-    
+
     <dependencies>
         <!-- parent -->
         <dependency>
@@ -45,7 +45,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>
@@ -85,7 +85,6 @@
             <groupId>org.apache.ws.scout</groupId>
             <artifactId>scout</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -99,55 +98,55 @@
                     </useMavenDependencies>
                     <category>Web Services</category>
                     <dependencies>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>server-security-config</artifactId>
-                          <version>${version}</version>
-                        <type>car</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>webservices-common</artifactId>
-                          <version>${version}</version>
-                        <type>car</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-axis</artifactId>
-                        <version>${version}</version>
-                        <type>jar</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>axis</groupId>
-                        <artifactId>axis</artifactId>
-                        <version>1.4</version>
-                        <type>jar</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.openejb</groupId>
-                        <artifactId>openejb-axis</artifactId>
-                        <version>${openejbVersion}</version>
-                        <type>jar</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>commons-discovery</groupId>
-                        <artifactId>commons-discovery</artifactId>
-                        <version>0.4</version>
-                        <type>jar</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.ws.scout</groupId>
-                        <artifactId>scout</artifactId>
-                        <version>1.0rc1</version>
-                        <type>jar</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>openejb</artifactId>
-                          <version>${version}</version>
-                        <type>car</type>
-                        <import>classes</import>
-                      </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.framework</groupId>
+                            <artifactId>server-security-config</artifactId>
+                            <version>${version}</version>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>webservices-common</artifactId>
+                            <version>${version}</version>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-axis</artifactId>
+                            <version>${version}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>axis</groupId>
+                            <artifactId>axis</artifactId>
+                            <version>1.4</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.openejb</groupId>
+                            <artifactId>openejb-axis</artifactId>
+                            <version>${openejbVersion}</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>commons-discovery</groupId>
+                            <artifactId>commons-discovery</artifactId>
+                            <version>0.4</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.ws.scout</groupId>
+                            <artifactId>scout</artifactId>
+                            <version>1.0rc1</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>openejb</artifactId>
+                            <version>${version}</version>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
                     </dependencies>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -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>axis</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-axis-builder</artifactId>
-    <name>Geronimo Modules :: Axis :: Builder</name>
+    <name>Geronimo Plugins, AXIS :: Builder</name>
 
     <dependencies>
-
         <!-- g-webservices-builder comes transitively from this -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
@@ -56,7 +55,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,32 +23,31 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>axis</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-axis</artifactId>
     <packaging>jar</packaging>
-    <name>Geronimo Modules :: Axis</name>
+    <name>Geronimo Plugins, AXIS :: Core</name>
     
     <dependencies>
-        
         <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-naming</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>
@@ -115,7 +114,6 @@
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/plugins/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,22 +26,21 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>axis</artifactId>
-    <name>Geronimo Plugins :: axis</name>
+    <name>Geronimo Plugins, AXIS</name>
     <packaging>pom</packaging>
 
     <description>
-        axis plugin
+        AXIS plugin
     </description>
 
     <modules>
-<module>axis</module>
-<module>axis-deployer</module>
-<module>geronimo-axis</module>
-<module>geronimo-axis-builder</module>
+        <module>axis</module>
+        <module>axis-deployer</module>
+        <module>geronimo-axis</module>
+        <module>geronimo-axis-builder</module>
     </modules>
 
 </project>