geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r698367 - in /geronimo/server/trunk: framework/modules/ framework/modules/geronimo-j2ee/ framework/modules/geronimo-security/ framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ framework/modules/geronimo-securit...
Date Tue, 23 Sep 2008 21:51:49 GMT
Author: djencks
Date: Tue Sep 23 14:51:48 2008
New Revision: 698367

URL: http://svn.apache.org/viewvc?rev=698367&view=rev
Log:
GERONIMO-4258 move geronimo-j2ee into plugins/j2ee

Added:
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityNames.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/
      - copied from r697435, geronimo/server/trunk/framework/modules/geronimo-j2ee/
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml
      - copied, changed from r698364, geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/
      - copied from r698364, geronimo/server/trunk/framework/modules/geronimo-j2ee/src/
Removed:
    geronimo/server/trunk/framework/modules/geronimo-j2ee/
Modified:
    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
    geronimo/server/trunk/framework/modules/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
    geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml
    geronimo/server/trunk/plugins/client/client/pom.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/client/geronimo-client/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml
    geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
    geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/RuntimeCustomizer.java
    geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/j2ee/pom.xml
    geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
    geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
    geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml
    geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml
    geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml

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=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Tue Sep 23 14:51:48 2008
@@ -34,13 +34,45 @@
     <dependencies>
 
         <!-- for GERONIMO_SERVICE constant string -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-j2ee</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-kernel</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-system</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-common</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-crypto</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-management</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
+            <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
+            <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jacc_1.1_spec</artifactId>

Added: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityNames.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityNames.java?rev=698367&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityNames.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityNames.java Tue Sep 23 14:51:48 2008
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.geronimo.security;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public interface SecurityNames {
+    static final String CERTIFICATION_AUTHORITY = "CertificationAuthority";
+    static final String CERTIFICATE_STORE = "CertificateStore";
+    static final String CERTIFICATE_REQUEST_STORE = "CertificateRequestStore";
+
+    static final String SECURITY_REALM = "SecurityRealm";
+    static final String LOGIN_MODULE = "LoginModule";
+    static final String LOGIN_MODULE_USE = "LoginModuleUse";
+    static final String JACC_MANAGER = "JACCManager";
+    static final String CONFIGURATION_ENTRY = "ConfigurationEntry";
+
+    static final String KEY_GENERATOR = "KeyGenerator";
+    static final String KEYSTORE_INSTANCE = "Keystore";
+
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityNames.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityNames.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityNames.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java Tue Sep 23 14:51:48 2008
@@ -24,7 +24,6 @@
 import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.security.jacc.PolicyContextHandlerContainerSubject;
 import org.apache.geronimo.security.jacc.PolicyContextHandlerHttpServletRequest;
 import org.apache.geronimo.security.jacc.PolicyContextHandlerSOAPMessage;
@@ -119,7 +118,7 @@
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(SecurityServiceImpl.class);
 
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
-        infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("ServerInfo", ServerInfo.class);
         infoFactory.addAttribute("policyConfigurationFactory", String.class, true);
         infoFactory.addAttribute("policyProvider", String.class, true);
         infoFactory.addAttribute("keyStore", String.class, true);

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java Tue Sep 23 14:51:48 2008
@@ -34,10 +34,10 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.management.geronimo.CertificateRequestStore;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.security.SecurityNames;
 
 /**
  * A certificate request store implementation using disk files.
@@ -190,7 +190,7 @@
      * This method stores the given certificate request under the given id.  If a request with the id
      * exists in the store, it will generate a new id and store the request under that id.
      * @param id Id under which the certificate request is to be stored
-     * @param csrText Certificate Request text
+     * @param csr Certificate Request text
      * @return Id under which the certificate request is stored
      */
     public String storeRequest(String id, String csr) {
@@ -295,11 +295,11 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(FileCertificateRequestStore.class, "CertificateRequestStore");
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(FileCertificateRequestStore.class, SecurityNames.CERTIFICATE_REQUEST_STORE);
         infoFactory.addAttribute("directoryPath", URI.class, true, false);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("abstractName", AbstractName.class, false);
-        infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("ServerInfo", ServerInfo.class);
         infoFactory.addInterface(CertificateRequestStore.class);
         infoFactory.setConstructor(new String[]{"ServerInfo", "directoryPath", "kernel", "abstractName"});
 

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java Tue Sep 23 14:51:48 2008
@@ -34,12 +34,12 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.management.geronimo.CertificateStore;
 import org.apache.geronimo.management.geronimo.CertificateStoreException;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.crypto.CaUtils;
+import org.apache.geronimo.security.SecurityNames;
 
 /**
  * A certificate store implementation using disk files.
@@ -76,7 +76,7 @@
     
     /**
      * Constructor
-     * @param storeDir directory for the certificate store
+     * @param directoryPath directory for the certificate store
      */
     public FileCertificateStore(ServerInfo serverInfo, URI directoryPath, Kernel kernel, AbstractName abstractName) {
         this.serverInfo = serverInfo;
@@ -333,11 +333,11 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(FileCertificateStore.class, "CertificateStore");
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(FileCertificateStore.class, SecurityNames.CERTIFICATE_STORE);
         infoFactory.addAttribute("directoryPath", URI.class, true, false);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("abstractName", AbstractName.class, false);
-        infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("ServerInfo", ServerInfo.class);
         infoFactory.addInterface(CertificateStore.class);
         infoFactory.setConstructor(new String[]{"ServerInfo", "directoryPath", "kernel", "abstractName"});
 

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java Tue Sep 23 14:51:48 2008
@@ -35,7 +35,6 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.management.geronimo.CertificateRequestStore;
 import org.apache.geronimo.management.geronimo.CertificateStore;
@@ -59,6 +58,7 @@
 import org.apache.geronimo.crypto.asn1.x509.Time;
 import org.apache.geronimo.crypto.asn1.x509.V3TBSCertificateGenerator;
 import org.apache.geronimo.crypto.asn1.x509.X509Name;
+import org.apache.geronimo.security.SecurityNames;
 
 /**
  * A Certification Authority implementation using KeystoreInstance to store CA's private key, 
@@ -97,7 +97,7 @@
     /**
      * Constructor
      * 
-     * @param instance KeystoreInstance containing CA's private-key and certificate
+     * @param caKeystore KeystoreInstance containing CA's private-key and certificate
      * @param certStore CertificateStore for storing certificates issued by this CA
      * @param certReqStore CeetificateRequestStore for storing certificates requests
      */
@@ -373,11 +373,11 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(GeronimoCertificationAuthority.class, "CertificationAuthority");
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(GeronimoCertificationAuthority.class, SecurityNames.CERTIFICATION_AUTHORITY);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("abstractName", AbstractName.class, false);
-        infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
-        infoFactory.addReference("KeystoreInstance", KeystoreInstance.class, NameFactory.KEYSTORE_INSTANCE);
+        infoFactory.addReference("ServerInfo", ServerInfo.class);
+        infoFactory.addReference("KeystoreInstance", KeystoreInstance.class, SecurityNames.KEYSTORE_INSTANCE);
         infoFactory.addReference("CertificateStore", CertificateStore.class, "CertificateStore");
         infoFactory.addReference("CertificateRequestStore", CertificateRequestStore.class, "CertificateRequestStore");
         infoFactory.addInterface(CertificationAuthority.class);

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java Tue Sep 23 14:51:48 2008
@@ -20,7 +20,7 @@
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.security.SecurityNames;
 
 
 /**
@@ -59,12 +59,12 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(DirectConfigurationEntry.class, NameFactory.CONFIGURATION_ENTRY);
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(DirectConfigurationEntry.class, SecurityNames.CONFIGURATION_ENTRY);
         infoFactory.addInterface(ConfigurationEntryFactory.class);
         infoFactory.addAttribute("applicationConfigName", String.class, true);
         infoFactory.addAttribute("controlFlag", LoginModuleControlFlag.class, true);
 
-        infoFactory.addReference("Module", LoginModuleSettings.class, NameFactory.LOGIN_MODULE);
+        infoFactory.addReference("Module", LoginModuleSettings.class, SecurityNames.LOGIN_MODULE);
 
         infoFactory.setConstructor(new String[]{"applicationConfigName", "controlFlag", "Module"});
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java Tue Sep 23 14:51:48 2008
@@ -27,9 +27,9 @@
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.security.SecurityNames;
 
 
 /**
@@ -123,9 +123,9 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(JaasLoginModuleUse.class, "LoginModuleUse");
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(JaasLoginModuleUse.class, SecurityNames.LOGIN_MODULE_USE);
         infoBuilder.addAttribute("controlFlag", LoginModuleControlFlag.class, true);
-        infoBuilder.addReference("LoginModule", LoginModuleSettings.class, NameFactory.LOGIN_MODULE);
+        infoBuilder.addReference("LoginModule", LoginModuleSettings.class, SecurityNames.LOGIN_MODULE);
         infoBuilder.addReference("Next", JaasLoginModuleUse.class);
 
         infoBuilder.addInterface(JaasLoginModuleChain.class);

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java Tue Sep 23 14:51:48 2008
@@ -21,7 +21,7 @@
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.security.SecurityNames;
 
 
 /**
@@ -93,7 +93,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(LoginModuleGBean.class, NameFactory.LOGIN_MODULE);
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(LoginModuleGBean.class, SecurityNames.LOGIN_MODULE);
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
         infoFactory.addInterface(LoginModuleSettings.class, new String[] {"options", "loginModuleClass", "loginDomainName", "wrapPrincipals"},
         		                 new String[] {"options", "loginModuleClass", "wrapPrincipals"} );

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java Tue Sep 23 14:51:48 2008
@@ -32,10 +32,10 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.IdentificationPrincipal;
 import org.apache.geronimo.security.SubjectId;
+import org.apache.geronimo.security.SecurityNames;
 import org.apache.geronimo.security.credentialstore.CredentialStore;
 import org.apache.geronimo.security.deploy.SubjectInfo;
 
@@ -167,13 +167,13 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ApplicationPolicyConfigurationManager.class, NameFactory.JACC_MANAGER);
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ApplicationPolicyConfigurationManager.class, SecurityNames.JACC_MANAGER);
         infoBuilder.addAttribute("contextIdToPermissionsMap", Map.class, true);
         infoBuilder.addAttribute("defaultSubjectInfo", SubjectInfo.class, true);
         infoBuilder.addAttribute("roleDesignates", Map.class, true);
         infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
-        infoBuilder.addReference("CredentialStore", CredentialStore.class, NameFactory.GERONIMO_SERVICE);
-        infoBuilder.addReference("PrincipalRoleMapper", PrincipalRoleMapper.class, NameFactory.JACC_MANAGER);
+        infoBuilder.addReference("CredentialStore", CredentialStore.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
+        infoBuilder.addReference("PrincipalRoleMapper", PrincipalRoleMapper.class, SecurityNames.JACC_MANAGER);
         infoBuilder.setConstructor(new String[] {"contextIdToPermissionsMap", "defaultSubjectInfo", "roleDesignates", "classLoader", "CredentialStore", "PrincipalRoleMapper"});
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java Tue Sep 23 14:51:48 2008
@@ -24,8 +24,8 @@
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.security.jacc.PrincipalRoleMapper;
+import org.apache.geronimo.security.SecurityNames;
 
 /**
  * @version $Rev$ $Date$
@@ -66,7 +66,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ApplicationPrincipalRoleConfigurationManager.class, NameFactory.JACC_MANAGER);
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ApplicationPrincipalRoleConfigurationManager.class, SecurityNames.JACC_MANAGER);
         infoBuilder.addAttribute("principalRoleMap", Map.class, true);
         infoBuilder.addInterface(PrincipalRoleMapper.class);
         infoBuilder.setConstructor(new String[] {"principalRoleMap"});

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java Tue Sep 23 14:51:48 2008
@@ -65,7 +65,6 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.management.geronimo.KeyNotFoundException;
 import org.apache.geronimo.management.geronimo.KeystoreException;
@@ -82,6 +81,7 @@
 import org.apache.geronimo.crypto.jce.PKCS10CertificationRequest;
 import org.apache.geronimo.crypto.jce.X509Principal;
 import org.apache.geronimo.crypto.jce.X509V1CertificateGenerator;
+import org.apache.geronimo.security.SecurityNames;
 
 /**
  * Implementation of KeystoreInstance that accesses a keystore file on the
@@ -143,7 +143,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(FileKeystoreInstance.class, NameFactory.KEYSTORE_INSTANCE);
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(FileKeystoreInstance.class, SecurityNames.KEYSTORE_INSTANCE);
         infoFactory.addAttribute("keystorePath", URI.class, true, false);
         infoFactory.addAttribute("keystoreName", String.class, true, false);
         infoFactory.addAttribute("keystorePassword", String.class, true, true);
@@ -151,7 +151,7 @@
         infoFactory.addAttribute("keyPasswords", String.class, true, true);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("abstractName", AbstractName.class, false);
-        infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("ServerInfo", ServerInfo.class);
         infoFactory.addInterface(KeystoreInstance.class);
         infoFactory.setConstructor(new String[]{"ServerInfo","keystorePath", "keystoreName", "keystorePassword", "keystoreType", "keyPasswords", "kernel", "abstractName"});
 

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java Tue Sep 23 14:51:48 2008
@@ -41,19 +41,19 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
+
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLContext;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.geronimo.crypto.KeystoreUtil;
+import org.apache.geronimo.crypto.jce.X509Principal;
+import org.apache.geronimo.crypto.jce.X509V1CertificateGenerator;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.EditableConfigurationManager;
@@ -63,10 +63,10 @@
 import org.apache.geronimo.management.geronimo.KeystoreInstance;
 import org.apache.geronimo.management.geronimo.KeystoreIsLocked;
 import org.apache.geronimo.management.geronimo.KeystoreManager;
+import org.apache.geronimo.security.SecurityNames;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.crypto.KeystoreUtil;
-import org.apache.geronimo.crypto.jce.X509Principal;
-import org.apache.geronimo.crypto.jce.X509V1CertificateGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An implementation of KeystoreManager that assumes every file in a specified
@@ -149,7 +149,7 @@
         }
         AbstractName aName;
         AbstractName myName = kernel.getAbstractNameFor(this);
-        aName = kernel.getNaming().createSiblingName(myName, name, NameFactory.KEYSTORE_INSTANCE);
+        aName = kernel.getNaming().createSiblingName(myName, name, SecurityNames.KEYSTORE_INSTANCE);
         GBeanData data = new GBeanData(aName, FileKeystoreInstance.getGBeanInfo());
         try {
             String path = configuredDir.toString();
@@ -423,7 +423,7 @@
         infoFactory.addAttribute("keystoreDir", URI.class, true);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
-        infoFactory.addReference("KeystoreInstances", KeystoreInstance.class, NameFactory.KEYSTORE_INSTANCE);
+        infoFactory.addReference("KeystoreInstances", KeystoreInstance.class, SecurityNames.KEYSTORE_INSTANCE);
         infoFactory.addInterface(KeystoreManager.class);
         infoFactory.setConstructor(new String[]{"keystoreDir", "ServerInfo", "KeystoreInstances", "kernel"});
 

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java Tue Sep 23 14:51:48 2008
@@ -26,11 +26,11 @@
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.security.jaas.ConfigurationEntryFactory;
 import org.apache.geronimo.security.jaas.JaasLoginModuleChain;
 import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
+import org.apache.geronimo.security.SecurityNames;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 
 
@@ -123,7 +123,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(GenericSecurityRealm.class, NameFactory.SECURITY_REALM);
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(GenericSecurityRealm.class, SecurityNames.SECURITY_REALM);
 
         infoFactory.addInterface(SecurityRealm.class);
         infoFactory.addInterface(ConfigurationEntryFactory.class);
@@ -134,7 +134,7 @@
         infoFactory.addAttribute("wrapPrincipals", boolean.class, true);
 
         infoFactory.addReference("LoginModuleConfiguration", JaasLoginModuleUse.class, "LoginModuleUse");
-        infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("ServerInfo", ServerInfo.class);
 
         infoFactory.setConstructor(new String[]{"realmName",
                                                 "LoginModuleConfiguration",

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java Tue Sep 23 14:51:48 2008
@@ -49,7 +49,6 @@
 import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
@@ -159,8 +158,8 @@
             Set<AbstractName> set = kernel.listGBeans(new AbstractNameQuery(JCAManagedConnectionFactory.class.getName()));
             JCAManagedConnectionFactory factory;
             for (AbstractName name : set) {
-                if (name.getName().get(NameFactory.J2EE_APPLICATION).equals(dataSourceAppName) &&
-                        name.getName().get(NameFactory.J2EE_NAME).equals(dataSourceName)) {
+                if (name.getName().get("J2EEApplication").equals(dataSourceAppName) &&
+                        name.getName().get("name").equals(dataSourceName)) {
                     try {
                         factory = (JCAManagedConnectionFactory) kernel.getGBean(name);
                         String type = factory.getConnectionFactoryInterface();

Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Tue Sep 23 14:51:48 2008
@@ -57,7 +57,7 @@
         <module>geronimo-deploy-tool</module>
         <module>geronimo-deployment</module>
         <module>geronimo-interceptor</module>
-        <module>geronimo-j2ee</module>
+        <!--<module>geronimo-j2ee</module>-->
         <module>geronimo-jdbc</module>
         <module>geronimo-jmx-remoting</module>
         <module>geronimo-kernel</module>

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=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Tue Sep 23 14:51:48 2008
@@ -98,7 +98,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
             <scope>provided</scope>

Modified: geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml (original)
+++ geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml Tue Sep 23 14:51:48 2008
@@ -44,7 +44,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Tue Sep 23 14:51:48 2008
@@ -76,7 +76,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Tue Sep 23 14:51:48 2008
@@ -82,7 +82,7 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/client/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client/pom.xml Tue Sep 23 14:51:48 2008
@@ -58,9 +58,8 @@
             <type>car</type>
         </dependency>
 
-        <!-- g-j2ee, jta spec, connector spec comes transitively from this -->
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml Tue Sep 23 14:51:48 2008
@@ -40,7 +40,7 @@
         <!--</dependency>-->
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml Tue Sep 23 14:51:48 2008
@@ -45,7 +45,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml Tue Sep 23 14:51:48 2008
@@ -49,7 +49,7 @@
 
         <dependency>
             <!-- for constants -->
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml Tue Sep 23 14:51:48 2008
@@ -45,7 +45,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Tue Sep 23 14:51:48 2008
@@ -58,7 +58,7 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
             <scope>provided</scope>

Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml Tue Sep 23 14:51:48 2008
@@ -60,7 +60,7 @@
             <!--<version>${version}</version>-->
         <!--</dependency>-->
         <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
             <!--<artifactId>geronimo-j2ee</artifactId>-->
             <!--<version>${version}</version>-->
         <!--</dependency>-->

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml Tue Sep 23 14:51:48 2008
@@ -102,7 +102,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
             <scope>provided</scope>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Tue Sep 23 14:51:48 2008
@@ -45,7 +45,7 @@
             <version>${version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml (from r698364, geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml?p2=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml&p1=geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml&r1=698364&r2=698367&rev=698367&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml Tue Sep 23 14:51:48 2008
@@ -23,11 +23,12 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>j2ee</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-j2ee</artifactId>
     <name>Geronimo Framework, Modules :: J2EE</name>
     
@@ -44,17 +45,6 @@
             <version>${version}</version>
         </dependency>
         
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-ejb_3.0_spec</artifactId>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
-<!--        
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-reflect</artifactId>
-        </dependency>
--->
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/RuntimeCustomizer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/RuntimeCustomizer.java?rev=698367&r1=698364&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/RuntimeCustomizer.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/RuntimeCustomizer.java Tue Sep 23 14:51:48 2008
@@ -23,7 +23,7 @@
 import java.util.Map;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface RuntimeCustomizer {
     void customize(Map<Class, Object> context);

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml Tue Sep 23 14:51:48 2008
@@ -72,7 +72,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Tue Sep 23 14:51:48 2008
@@ -7,7 +7,7 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/pom.xml Tue Sep 23 14:51:48 2008
@@ -35,6 +35,7 @@
     </description>
     
     <modules>
+        <module>geronimo-j2ee</module>
         <module>geronimo-j2ee-builder</module>
         <module>j2ee-deployer</module>
         <module>geronimo-j2ee-schema</module>

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml Tue Sep 23 14:51:48 2008
@@ -55,7 +55,7 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml Tue Sep 23 14:51:48 2008
@@ -33,9 +33,8 @@
     <name>Geronimo Plugins, JavaMail :: Core</name>
 
     <dependencies>
-        <!-- g-kernel, g-management comes transitively from this -->
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
             <scope>provided</scope>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Tue Sep 23 14:51:48 2008
@@ -39,7 +39,7 @@
             <version>${version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml Tue Sep 23 14:51:48 2008
@@ -34,7 +34,7 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml Tue Sep 23 14:51:48 2008
@@ -34,7 +34,7 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
             <scope>provided</scope>

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=698367&r1=698366&r2=698367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Tue Sep 23 14:51:48 2008
@@ -46,7 +46,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>



Mime
View raw message