geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r387983 - in /geronimo/branches/1.1: applications/console-core/src/java/org/apache/geronimo/console/core/jms/ applications/console-core/src/java/org/apache/geronimo/console/util/ applications/console-standard/src/java/org/apache/geronimo/co...
Date Thu, 23 Mar 2006 00:45:04 GMT
Author: djencks
Date: Wed Mar 22 16:44:59 2006
New Revision: 387983

URL: http://svn.apache.org/viewcvs?rev=387983&view=rev
Log:
Openejb builds, tests pass (except for some commented out ones).  Start of work to get console to compile.

Added:
    geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectSource.java
    geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionFactorySource.java
Modified:
    geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
    geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java
    geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java
    geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
    geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java
    geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLogGBean.java
    geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
    geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
    geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java
    geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
    geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
    geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
    geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
    geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java

Modified: geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java (original)
+++ geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java Wed Mar 22 16:44:59 2006
@@ -22,6 +22,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
+import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -30,14 +31,14 @@
 
     private static Log log = LogFactory.getLog(JMSConnectionFactoryBean.class);
 
-    private final ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper;
+    private final ConnectionFactorySource managedConnectionFactoryWrapper;
 
     private String connectionFactoryName = "jms/DefaultActiveMQConnectionFactory";
 
     private ConnectionFactory connectionFactory;
 
     public JMSConnectionFactoryBean(
-            ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper) {
+            ConnectionFactorySource managedConnectionFactoryWrapper) {
         this.managedConnectionFactoryWrapper = managedConnectionFactoryWrapper;
 
     }
@@ -73,7 +74,7 @@
                 false);
 
         infoFactory.addReference("ManagedConnectionFactoryWrapper",
-                ManagedConnectionFactoryWrapper.class);
+                ConnectionFactorySource.class);
         infoFactory.addOperation("getConnectionFactory");
 
         infoFactory

Modified: geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java (original)
+++ geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java Wed Mar 22 16:44:59 2006
@@ -16,14 +16,36 @@
  */
 package org.apache.geronimo.console.util;
 
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanQuery;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.management.impl.Util;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Repository;
@@ -65,37 +87,17 @@
 import org.apache.geronimo.system.logging.SystemLog;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * An implementation of the ManagementHelper interface that uses a Geronimo
  * kernel. That may be an in-VM kernel or a remote kernel, we don't really
  * care.
  *
- * @version $Rev: 385886 $ $Date$
+ * @version $Rev:386276 $ $Date$
  */
 public class KernelManagementHelper implements ManagementHelper {
     private final static Log log = LogFactory.getLog(KernelManagementHelper.class);
-    private Kernel kernel;
-    private ProxyManager pm;
+    private final Kernel kernel;
+    private final ProxyManager pm;
 
     public KernelManagementHelper(Kernel kernel) {
         this.kernel = kernel;
@@ -103,12 +105,11 @@
     }
 
     public J2EEDomain[] getDomains() {
-        //currently returns ObjectNames
-        Set domainNames = kernel.listGBeans(new GBeanQuery(null, J2EEDomain.class.getName()));
+        Set domainNames = kernel.listGBeans(new AbstractNameQuery(J2EEDomain.class.getName()));
         J2EEDomain[] result = new J2EEDomain[domainNames.size()];
         int i = 0;
         for (Iterator iterator = domainNames.iterator(); iterator.hasNext();) {
-            ObjectName domainName = (ObjectName) iterator.next();
+            AbstractName domainName = (AbstractName) iterator.next();
             result[i++] = (J2EEDomain) pm.createProxy(domainName, J2EEDomain.class);
         }
         return result;
@@ -549,14 +550,14 @@
     }
 
     public WebAccessLog getWebAccessLog(WebManager manager, WebContainer container) {
-        return getWebAccessLog(manager, kernel.getAbstractNameFor(container).getCanonicalName());
+        return getWebAccessLog(manager, kernel.getAbstractNameFor(container).getObjectName().getCanonicalName());
     }
 
     public WebAccessLog getWebAccessLog(WebManager manager, String container) {
         WebAccessLog result = null;
         try {
-            String name = manager.getAccessLog(container);
-            Object temp = pm.createProxy(ObjectName.getInstance(name), KernelManagementHelper.class.getClassLoader());
+            AbstractName name = manager.getAccessLog(container);
+            Object temp = pm.createProxy(name, KernelManagementHelper.class.getClassLoader());
             result = (WebAccessLog) temp;
         } catch (Exception e) {
             log.error("Unable to look up related GBean", e);
@@ -567,7 +568,7 @@
     public WebContainer[] getWebContainers(WebManager manager) {
         WebContainer[] result = new WebContainer[0];
         try {
-            String[] names = manager.getContainers();
+            AbstractName[] names = manager.getContainers();
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new WebContainer[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -578,17 +579,18 @@
     }
 
     public WebConnector[] getWebConnectorsForContainer(WebManager manager, WebContainer container, String protocol) {
-        return getWebConnectorsForContainer(manager, kernel.getAbstractNameFor(container).getCanonicalName(), protocol);
+        return getWebConnectorsForContainer(manager, kernel.getAbstractNameFor(container).getObjectName().getCanonicalName(), protocol);
     }
 
     public WebConnector[] getWebConnectorsForContainer(WebManager manager, WebContainer container) {
-        return getWebConnectorsForContainer(manager, kernel.getAbstractNameFor(container).getCanonicalName());
+        return getWebConnectorsForContainer(manager, kernel.getAbstractNameFor(container).getObjectName().getCanonicalName());
     }
 
     public WebConnector[] getWebConnectorsForContainer(WebManager manager, String containerObjectName, String protocol) {
         WebConnector[] result = new WebConnector[0];
         try {
-            String[] names = manager.getConnectorsForContainer(containerObjectName, protocol);
+            AbstractName name = new AbstractName(URI.create(containerObjectName));
+            AbstractName[] names = manager.getConnectorsForContainer(name, protocol);
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new WebConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -601,7 +603,8 @@
     public WebConnector[] getWebConnectorsForContainer(WebManager manager, String containerObjectName) {
         WebConnector[] result = new WebConnector[0];
         try {
-            String[] names = manager.getConnectorsForContainer(containerObjectName);
+            AbstractName name = new AbstractName(URI.create(containerObjectName));
+            AbstractName[] names = manager.getConnectorsForContainer(name);
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new WebConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -614,7 +617,7 @@
     public WebConnector[] getWebConnectors(WebManager manager, String protocol) {
         WebConnector[] result = new WebConnector[0];
         try {
-            String[] names = manager.getConnectors(protocol);
+            AbstractName[] names = manager.getConnectors(protocol);
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new WebConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -627,7 +630,7 @@
     public WebConnector[] getWebConnectors(WebManager manager) {
         WebConnector[] result = new WebConnector[0];
         try {
-            String[] names = manager.getConnectors();
+            AbstractName[] names = manager.getConnectors();
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new WebConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -653,7 +656,7 @@
     public EJBConnector[] getEJBConnectors(EJBManager container, String protocol) {
         EJBConnector[] result = new EJBConnector[0];
         try {
-            String[] names = container.getConnectors(protocol);
+            AbstractName[] names = container.getConnectors(protocol);
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new EJBConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -666,7 +669,7 @@
     public EJBConnector[] getEJBConnectors(EJBManager container) {
         EJBConnector[] result = new EJBConnector[0];
         try {
-            String[] names = container.getConnectors();
+            AbstractName[] names = container.getConnectors();
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new EJBConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -692,7 +695,7 @@
     public JMSBroker[] getJMSBrokers(JMSManager manager) {
         JMSBroker[] result = null;
         try {
-            String[] names = manager.getContainers();
+            AbstractName[] names = manager.getContainers();
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new JMSBroker[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -705,7 +708,7 @@
     public JMSConnector[] getJMSConnectors(JMSManager manager, String protocol) {
         JMSConnector[] result = null;
         try {
-            String[] names = manager.getConnectors(protocol);
+            AbstractName[] names = manager.getConnectors(protocol);
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new JMSConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -718,7 +721,7 @@
     public JMSConnector[] getJMSConnectors(JMSManager manager) {
         JMSConnector[] result = null;
         try {
-            String[] names = manager.getConnectors();
+            AbstractName[] names = manager.getConnectors();
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new JMSConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -729,17 +732,18 @@
     }
 
     public JMSConnector[] getJMSConnectorsForContainer(JMSManager manager, JMSBroker broker, String protocol) {
-        return getJMSConnectorsForContainer(manager, kernel.getAbstractNameFor(broker).getCanonicalName(), protocol);
+        return getJMSConnectorsForContainer(manager, kernel.getAbstractNameFor(broker).getObjectName().getCanonicalName(), protocol);
     }
 
     public JMSConnector[] getJMSConnectorsForContainer(JMSManager manager, JMSBroker broker) {
-        return getJMSConnectorsForContainer(manager, kernel.getAbstractNameFor(broker).getCanonicalName());
+        return getJMSConnectorsForContainer(manager, kernel.getAbstractNameFor(broker).getObjectName().getCanonicalName());
     }
 
     public JMSConnector[] getJMSConnectorsForContainer(JMSManager manager, String brokerObjectName, String protocol) {
         JMSConnector[] result = null;
         try {
-            String[] names = manager.getConnectorsForContainer(brokerObjectName, protocol);
+            AbstractName name = new AbstractName(URI.create(brokerObjectName));
+            AbstractName[] names = manager.getConnectorsForContainer(name, protocol);
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new JMSConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -752,7 +756,8 @@
     public JMSConnector[] getJMSConnectorsForContainer(JMSManager manager, String brokerObjectName) {
         JMSConnector[] result = null;
         try {
-            String[] names = manager.getConnectorsForContainer(brokerObjectName);
+            AbstractName name = new AbstractName(URI.create(brokerObjectName));
+            AbstractName[] names = manager.getConnectorsForContainer(name);
             Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
             result = new JMSConnector[temp.length];
             System.arraycopy(temp, 0, result, 0, temp.length);
@@ -1008,16 +1013,19 @@
 
     public Artifact getConfigurationNameFor(String objectName) {
         try {
-            Set parents = kernel.getDependencyManager().getParents(ObjectName.getInstance(objectName));
-            if(parents.size() == 0) {
-                throw new IllegalStateException("No parents for GBean '"+objectName+"'");
-            }
-            for (Iterator it = parents.iterator(); it.hasNext();) {
-                ObjectName name = (ObjectName) it.next();
-                if(Configuration.isConfigurationObjectName(name)) {
-                    return Configuration.getConfigurationID(name);
-                }
-            }
+            //TODO the code that calls this does not supply an abstract name
+            AbstractName abstractName = new AbstractName(URI.create(objectName));
+            return abstractName.getArtifact();
+//            Set parents = kernel.getDependencyManager().getParents(ObjectName.getInstance(objectName));
+//            if(parents.size() == 0) {
+//                throw new IllegalStateException("No parents for GBean '"+objectName+"'");
+//            }
+//            for (Iterator it = parents.iterator(); it.hasNext();) {
+//                ObjectName name = (ObjectName) it.next();
+//                if(Configuration.isConfigurationObjectName(name)) {
+//                    return Configuration.getConfigurationID(name);
+//                }
+//            }
         } catch (Exception e) {
             log.error("Unable to look up related GBean", e);
         }

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java Wed Mar 22 16:44:59 2006
@@ -19,20 +19,46 @@
 
 import java.util.Iterator;
 import java.util.Set;
+import java.util.Map;
 
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
+import javax.jms.Topic;
+import javax.jms.Queue;
 
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.console.GeronimoVersion;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 
 public abstract class AbstractJMSManager {
 
-    protected static final String JMS_SERVER_MBEAN_NAME = "geronimo.server:J2EEApplication=null,J2EEModule=geronimo/activemq-broker/" + GeronimoVersion.GERONIMO_VERSION + "/car,J2EEServer=geronimo,j2eeType=JMSServer,name=ActiveMQl";
+    protected static final Artifact ACTIVEMQ_BROKER_ARTIFACT = new Artifact("geronimo", "activemq-broker", GeronimoVersion.GERONIMO_VERSION, "car");
+    protected static final Artifact ACTIVEMQ_ARTIFACT = new Artifact("geronimo", "activemq", GeronimoVersion.GERONIMO_VERSION, "car");
+    protected static final Kernel kernel = KernelRegistry.getSingleKernel();
+
+    protected static final ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+    protected final Configuration BROKER_CONFIGURATION = configurationManager.getConfiguration(ACTIVEMQ_BROKER_ARTIFACT);
+    protected final Configuration CONNECTOR_CONFIGURATION = configurationManager.getConfiguration(ACTIVEMQ_ARTIFACT);
+//    protected static final String JMS_SERVER_MBEAN_NAME = "geronimo.server:J2EEApplication=null,J2EEModule=geronimo/activemq-broker/" + GeronimoVersion.GERONIMO_VERSION + "/car,J2EEServer=geronimo,j2eeType=JMSServer,name=ActiveMQl";
+
+    private static final AbstractName earName = kernel.getNaming().createRootName(ACTIVEMQ_ARTIFACT, NameFactory.NULL, NameFactory.J2EE_APPLICATION);
+    protected static final AbstractName RESOURCE_ADAPTER_MODULE_NAME = kernel.getNaming().createChildName(earName, ACTIVEMQ_ARTIFACT.toString(), NameFactory.RESOURCE_ADAPTER_MODULE);
+    protected static final AbstractName RESOURCE_ADAPTER_NAME = kernel.getNaming().createChildName(RESOURCE_ADAPTER_MODULE_NAME, ACTIVEMQ_ARTIFACT.toString(), NameFactory.RESOURCE_ADAPTER);
+    protected static final AbstractName JCA_RESOURCE_NAME = kernel.getNaming().createChildName(RESOURCE_ADAPTER_NAME, ACTIVEMQ_ARTIFACT.toString(), NameFactory.JCA_RESOURCE);
+    protected static final AbstractName JCA_CONNECTION_FACTORY_NAME = kernel.getNaming().createChildName(JCA_RESOURCE_NAME, "DefaultActiveMQConnectionFactory", NameFactory.JCA_CONNECTION_FACTORY);
+    protected static final AbstractName JCA_MANAGED_CONNECTION_FACTORY_NAME = kernel.getNaming().createChildName(JCA_CONNECTION_FACTORY_NAME, "DefaultActiveMQConnectionFactory", NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
+
 
     protected static final String GET_BROKER_ADMIN_FUNCTION = "getBrokerAdmin";
 
@@ -58,66 +84,83 @@
 
     protected static final String DESTINATION_CONFIG_URI = "destinationConfigURI";
 
-    protected static final String CONNECTION_FACTORY_NAME = "geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/activemq/" + GeronimoVersion.GERONIMO_VERSION + "/car,j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory";
+//    protected static final String CONNECTION_FACTORY_NAME = "geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/activemq/" + GeronimoVersion.GERONIMO_VERSION + "/car,j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory";
 
     protected static Object[] no_args = new Object[0];
 
     protected static String[] no_params = new String[0];
 
-    protected static Kernel kernel = KernelRegistry.getSingleKernel();
 
     protected static final String BASE_CONFIG_URI = "runtimedestination/";
 
-    protected ObjectName mBeanName;
-
-    public static final ObjectName DESTINATION_QUERY;
-
-    public static final ObjectName ACTIVEMQJCA_RESOURCE_QUERY;
+    protected GBeanData getResourceAdapterModuleData() throws GBeanNotFoundException {
+        return CONNECTOR_CONFIGURATION.findGBeanData(new AbstractNameQuery(RESOURCE_ADAPTER_MODULE_NAME));
+    }
 
-    public static final String ACTIVEMQJCA_RESOURCE;
+    protected GBeanData getQueueGBeanData() throws GBeanNotFoundException {
+        GBeanData moduleData = getResourceAdapterModuleData();
+        Map adminObjects = (Map) moduleData.getAttribute("adminObjectInfoMap");
+        GBeanData queueData = (GBeanData) adminObjects.get(Queue.class.getName());
+        return new GBeanData(queueData);
+    }
 
-    static {
-        try {
+    protected GBeanData getTopicGBeanData() throws GBeanNotFoundException {
+        GBeanData moduleData = getResourceAdapterModuleData();
+        Map adminObjects = (Map) moduleData.getAttribute("adminObjectInfoMap");
+        GBeanData queueData = (GBeanData) adminObjects.get(Topic.class.getName());
+        return new GBeanData(queueData);
+    }
 
-            DESTINATION_QUERY = ObjectName
-                    .getInstance("geronimo.server:j2eeType="
-                            + NameFactory.JCA_ADMIN_OBJECT + ",*");
-            ACTIVEMQJCA_RESOURCE_QUERY = ObjectName
-                    .getInstance("*:j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory,*");
-            ACTIVEMQJCA_RESOURCE = getActiveMQJCA_RESOURCE(ACTIVEMQJCA_RESOURCE_QUERY);
+//    protected ObjectName mBeanName;
 
-            if (null == ACTIVEMQJCA_RESOURCE) {
-                throw new RuntimeException(
-                        "No JCA resource was found for DefaultActiveMQConnectionFactory");
-            }
+//    public static final ObjectName DESTINATION_QUERY;
 
-        } catch (MalformedObjectNameException e) {
-            throw new RuntimeException(e);
-        }
-    }
+//    public static final ObjectName ACTIVEMQJCA_RESOURCE_QUERY;
 
-    public static final J2eeContext baseContext = new J2eeContextImpl(
-            "geronimo.server", "geronimo", "null", ACTIVEMQJCA_RESOURCE, null,
-            null, NameFactory.JCA_ADMIN_OBJECT);
+//    public static final String ACTIVEMQJCA_RESOURCE;
 
+//    static {
+//        try {
+//
+//            DESTINATION_QUERY = ObjectName
+//                    .getInstance("geronimo.server:j2eeType="
+//                            + NameFactory.JCA_ADMIN_OBJECT + ",*");
+//            ACTIVEMQJCA_RESOURCE_QUERY = ObjectName
+//                    .getInstance("*:j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory,*");
+//            ACTIVEMQJCA_RESOURCE = getActiveMQJCA_RESOURCE(ACTIVEMQJCA_RESOURCE_QUERY);
+//
+//            if (null == ACTIVEMQJCA_RESOURCE) {
+//                throw new RuntimeException(
+//                        "No JCA resource was found for DefaultActiveMQConnectionFactory");
+//            }
+//
+//        } catch (MalformedObjectNameException e) {
+//            throw new RuntimeException(e);
+//        }
+//    }
+//
+//    public static final J2eeContext baseContext = new J2eeContextImpl(
+//            "geronimo.server", "geronimo", "null", ACTIVEMQJCA_RESOURCE, null,
+//            null, NameFactory.JCA_ADMIN_OBJECT);
+//
     /**
      * Get the JCA resource name of the activemq bean.
      *
      * @return JCA resource name
      */
-    public static String getActiveMQJCA_RESOURCE(ObjectName obj) {
-
-        Set modules = kernel.listGBeans(obj);
-
-        String JCA_Resource = null;
-
-        for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
-            ObjectName activemqObject = (ObjectName) iterator.next();
-            JCA_Resource = activemqObject
-                    .getKeyProperty(NameFactory.JCA_RESOURCE);
-        }
-
-        return JCA_Resource;
-    }
+//    public static String getActiveMQJCA_RESOURCE(ObjectName obj) {
+//
+//        Set modules = kernel.listGBeans(obj);
+//
+//        String JCA_Resource = null;
+//
+//        for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
+//            ObjectName activemqObject = (ObjectName) iterator.next();
+//            JCA_Resource = activemqObject
+//                    .getKeyProperty(NameFactory.JCA_RESOURCE);
+//        }
+//
+//        return JCA_Resource;
+//    }
 
 }

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java Wed Mar 22 16:44:59 2006
@@ -17,61 +17,54 @@
 
 package org.apache.geronimo.console.jmsmanager.handlers;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.management.ObjectName;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.connector.AdminObjectWrapper;
-import org.apache.geronimo.connector.AdminObjectWrapperGBean;
 import org.apache.geronimo.console.GeronimoVersion;
 import org.apache.geronimo.console.core.jms.TopicBrowserGBean;
 import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
-import org.apache.geronimo.gbean.DynamicGAttributeInfo;
+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.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.kernel.repository.Dependency;
 import org.apache.geronimo.kernel.repository.ImportType;
 
-import javax.jms.Queue;
-import javax.jms.Topic;
-import javax.management.ObjectName;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-
 public class CreateDestinationHandler extends AbstractJMSManager implements PortletResponseHandler {
     protected static Log log = LogFactory
             .getLog(CreateDestinationHandler.class);
 
     private static final Artifact parentId = new Artifact("geronimo", "activemq-broker", GeronimoVersion.GERONIMO_VERSION, "car");
 
-    static final GBeanInfo QUEUE_INFO;
-
-    static final GBeanInfo TOPIC_INFO;
-
-    static {
-        GBeanInfoBuilder queueInfoBuilder = new GBeanInfoBuilder(
-                AdminObjectWrapper.class, AdminObjectWrapperGBean.GBEAN_INFO);
-        queueInfoBuilder.addAttribute(new DynamicGAttributeInfo("PhysicalName",
-                String.class.getName(), true, true, true, true));
-        QUEUE_INFO = queueInfoBuilder.getBeanInfo();
-        GBeanInfoBuilder topicInfoBuilder = new GBeanInfoBuilder(
-                AdminObjectWrapper.class, AdminObjectWrapperGBean.GBEAN_INFO);
-        topicInfoBuilder.addAttribute(new DynamicGAttributeInfo("PhysicalName",
-                String.class.getName(), true, true, true, true));
-        TOPIC_INFO = topicInfoBuilder.getBeanInfo();
-    }
+//    static final GBeanInfo QUEUE_INFO;
+//
+//    static final GBeanInfo TOPIC_INFO;
+//
+//    static {
+//        GBeanInfoBuilder queueInfoBuilder = new GBeanInfoBuilder(
+//                AdminObjectWrapper.class, AdminObjectWrapperGBean.GBEAN_INFO);
+//        queueInfoBuilder.addAttribute(new DynamicGAttributeInfo("PhysicalName",
+//                String.class.getName(), true, true, true, true));
+//        QUEUE_INFO = queueInfoBuilder.getBeanInfo();
+//        GBeanInfoBuilder topicInfoBuilder = new GBeanInfoBuilder(
+//                AdminObjectWrapper.class, AdminObjectWrapperGBean.GBEAN_INFO);
+//        topicInfoBuilder.addAttribute(new DynamicGAttributeInfo("PhysicalName",
+//                String.class.getName(), true, true, true, true));
+//        TOPIC_INFO = topicInfoBuilder.getBeanInfo();
+//    }
 
     public void processAction(ActionRequest request, ActionResponse response)
             throws IOException, PortletException {
@@ -84,28 +77,41 @@
         String destinationModuleName = request
                 .getParameter(DESTINATION_MODULE_NAME);
         try {
-            ObjectName adminObjectName = NameFactory.getComponentName(null,
-                    null, destinationApplicationName, NameFactory.JCA_RESOURCE,
-                    destinationModuleName, destinationName, null, baseContext);
+
+            Artifact configId = new Artifact(Artifact.DEFAULT_GROUP_ID, BASE_CONFIG_URI + destinationName, "0", "car");
+            ConfigurationData configurationData = new ConfigurationData(configId, kernel.getNaming());
+            configurationData.getEnvironment().addDependency(new Dependency(ACTIVEMQ_ARTIFACT, ImportType.ALL));
+
+            AbstractName adminObjectName = kernel.getNaming().createRootName(configId, destinationName, NameFactory.JCA_ADMIN_OBJECT);
+//            ObjectName adminObjectName = NameFactory.getComponentName(null,
+//                    null, destinationApplicationName, NameFactory.JCA_RESOURCE,
+//                    destinationModuleName, destinationName, null, baseContext);
 
             GBeanData adminObjectData;
             if (Topic.class.getName().equals(destinationType)) {
-                adminObjectData = new GBeanData(adminObjectName, TOPIC_INFO);
-                adminObjectData.setAttribute("adminObjectInterface", "javax.jms.Topic");
-                adminObjectData.setAttribute("adminObjectClass", "org.activemq.message.ActiveMQTopic");
+                adminObjectData = getTopicGBeanData();
+                // If we are adding a topic we have to add a browser so we can view
+                // its messages later.
+                AbstractName browserName = kernel.getNaming().createChildName(adminObjectName, destinationName, "TopicBrowser");
+                GBeanData tBrowserBeanData = new GBeanData(browserName, TopicBrowserGBean.GBEAN_INFO);
+                tBrowserBeanData.setAttribute("subscriberName", destinationName);
+                tBrowserBeanData.setReferencePattern("ConnectionFactoryWrapper", JCA_MANAGED_CONNECTION_FACTORY_NAME);
+                tBrowserBeanData.setReferencePattern("TopicWrapper",
+                        adminObjectName);
+
+                configurationData.addGBean(tBrowserBeanData);
             } else if (Queue.class.getName().equals(destinationType)) {
-                adminObjectData = new GBeanData(adminObjectName, QUEUE_INFO);
-                adminObjectData.setAttribute("adminObjectInterface", "javax.jms.Queue");
-                adminObjectData.setAttribute("adminObjectClass", "org.activemq.message.ActiveMQQueue.class");
+                adminObjectData = getQueueGBeanData();
             } else {
                 throw new PortletException(
                         "Invalid choice destination, must be FQCL of Topic or Queue, not "
                                 + destinationType);
             }
+            adminObjectData.setAbstractName(adminObjectName);
             adminObjectData.setAttribute("PhysicalName",
                     destinationPhysicalName);
+            configurationData.addGBean(adminObjectData);
 
-            Artifact configId = new Artifact(Artifact.DEFAULT_GROUP_ID, BASE_CONFIG_URI + destinationName, "0", "car");
 
             ConfigurationManager configurationManager = ConfigurationUtil
                     .getConfigurationManager(kernel);
@@ -115,45 +121,24 @@
             ObjectName storeName = (ObjectName) stores.iterator().next();
             File installDir = (File) kernel.invoke(storeName,
                     "createNewConfigurationDir");
-            Environment environment = new Environment();
-            environment.setConfigId(configId);
-            environment.addDependency(parentId, ImportType.ALL);
-            List gbeans = new ArrayList();
-            gbeans.add(adminObjectData);
-            // If we are adding a topic we have to add a browser so we can view
-            // its messages later.
-            if (Topic.class.getName().equals(destinationType)) {
-                GBeanData tBrowserBeanData = new GBeanData(NameFactory
-                        .getComponentName(null, null,
-                                destinationApplicationName,
-                                NameFactory.JCA_RESOURCE,
-                                destinationModuleName, destinationName,
-                                "TopicBrowser", baseContext),
-                        TopicBrowserGBean.GBEAN_INFO);
-                tBrowserBeanData
-                        .setAttribute("subscriberName", destinationName);
-                tBrowserBeanData.setReferencePattern(
-                        "ConnectionFactoryWrapper", ObjectName
-                                .getInstance(CONNECTION_FACTORY_NAME));
-                tBrowserBeanData.setReferencePattern("TopicWrapper",
-                        adminObjectName);
-
-                gbeans.add(tBrowserBeanData);
-            }
+//            Environment environment = new Environment();
+//            environment.setConfigId(configId);
+//            environment.addDependency(parentId, ImportType.ALL);
+//            List gbeans = new ArrayList();
+//            gbeans.add(adminObjectData);
             //TODO configid FIXME set configurationDir correctly
             File configurationDir = null;
-            ConfigurationData configData = new ConfigurationData(ConfigurationModuleType.SERVICE,
-                    new LinkedHashSet(),
-                    gbeans,
-                    Collections.EMPTY_LIST,
-                    environment, configurationDir,
-                    kernel.getNaming());
+//            ConfigurationData configData = new ConfigurationData(ConfigurationModuleType.SERVICE,
+//                    new LinkedHashSet(),
+//                    gbeans,
+//                    Collections.EMPTY_LIST,
+//                    environment, configurationDir,
+//                    kernel.getNaming());
 
             //saves it.
             //deploymentContext.close();
-            kernel.invoke(storeName, "install", new Object[] {configData,
-                    installDir}, new String[] {
-                    ConfigurationData.class.getName(), File.class.getName() });
+            kernel.invoke(storeName, "install", new Object[] {configurationData, installDir},
+                    new String[] {ConfigurationData.class.getName(), File.class.getName() });
 
             configurationManager.loadConfiguration(configId);
             configurationManager.startConfiguration(configId);

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java Wed Mar 22 16:44:59 2006
@@ -30,13 +30,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
-import org.apache.geronimo.console.util.ObjectNameConstants;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.kernel.DependencyManager;
+import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.Configuration;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
 
 public class RemoveDestinationHandler extends AbstractJMSManager implements
         PortletResponseHandler {
@@ -64,7 +62,7 @@
             // "getConfiguration", new Object[]{destinationConfigURI}, new
             // String[]{URI.class.getName()});
             GBeanData topicBrowser = kernel.getGBeanData(configurationObjectName);
-            java.util.Set children = dm.getChildren(topicBrowser.getName());
+            java.util.Set children = dm.getChildren(topicBrowser.getAbstractName());
             for (Iterator i = children.iterator(); i.hasNext();) {
                 ObjectName o = (ObjectName) i.next();
                 if ("TopicBrowser".equals(o.getKeyProperty("j2eeType"))) {

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java Wed Mar 22 16:44:59 2006
@@ -37,12 +37,11 @@
 import org.activemq.service.DeadLetterPolicy;
 import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.gbean.AbstractName;
 
 public class ViewDLQRenderer extends AbstractJMSManager implements
         PortletRenderer {
 
-    private Destination destination = null;
-
     private Destination dlq = null;
 
     private QueueBrowser dlqBrowser = null;
@@ -64,13 +63,14 @@
         String destinationName = request.getParameter("destinationName");
 
         try {
-            ObjectName adminObjectName = NameFactory.getComponentName(null,
-                    null, destinationApplicationName, NameFactory.JCA_RESOURCE,
-                    destinationModuleName, destinationName, null, baseContext);
-            destination = (Destination) kernel.invoke(adminObjectName,
+            //TODO configid disabled
+            AbstractName adminObjectName = null;//NameFactory.getComponentName(null,
+//                    null, destinationApplicationName, NameFactory.JCA_RESOURCE,
+//                    destinationModuleName, destinationName, null, baseContext);
+            Destination destination = (Destination) kernel.invoke(adminObjectName,
                     "$getResource");
             ConnectionFactory connectionFactory = (ConnectionFactory) kernel
-                    .invoke(ObjectName.getInstance(CONNECTION_FACTORY_NAME),
+                    .invoke(JCA_MANAGED_CONNECTION_FACTORY_NAME,
                             "$getResource");
             connection = connectionFactory.createConnection();
             session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java Wed Mar 22 16:44:59 2006
@@ -28,6 +28,7 @@
 import javax.portlet.PortletException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
+import javax.jms.Destination;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -37,6 +38,8 @@
 import org.apache.geronimo.kernel.DependencyManager;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.AbstractName;
 
 public class ViewDestinationsRenderer extends AbstractJMSManager implements
         PortletRenderer {
@@ -58,11 +61,11 @@
             RenderResponse response) {
         Kernel kernel = KernelRegistry.getSingleKernel();
 
-        Set destinations = kernel.listGBeans(DESTINATION_QUERY);
+        Set destinations = kernel.listGBeans(new AbstractNameQuery(Destination.class.getName()));
         List destinationInfos = new ArrayList(destinations.size());
         DependencyManager dm = kernel.getDependencyManager();
         for (Iterator iterator = destinations.iterator(); iterator.hasNext();) {
-            ObjectName destinationName = (ObjectName) iterator.next();
+            AbstractName destinationName = (AbstractName) iterator.next();
 
             try {
                 Class type;
@@ -81,8 +84,7 @@
                     continue;
                 }
                 ObjectName parent = (ObjectName) i.next();
-                String adminObjectName = destinationName
-                        .getKeyProperty(NameFactory.J2EE_NAME);
+                String adminObjectName = (String) destinationName.getName().get(NameFactory.J2EE_NAME);
                 if (adminObjectName.equals("MDBTransferBeanOutQueue")
                         || adminObjectName.equals("SendReceiveQueue")) {
                     continue;
@@ -96,11 +98,10 @@
                 }
 
                 DestinationInfo info = new DestinationInfo(adminObjectName,
-                        (String) kernel.getAttribute(destinationName,
-                                "PhysicalName"), type, destinationName
-                                .getKeyProperty(NameFactory.J2EE_APPLICATION),
-                        destinationName
-                                .getKeyProperty(NameFactory.JCA_RESOURCE),
+                        (String) kernel.getAttribute(destinationName, "PhysicalName"),
+                        type,
+                        (String) destinationName.getName().get(NameFactory.J2EE_APPLICATION),
+                        (String) destinationName.getName().get(NameFactory.JCA_RESOURCE),
                         configURI);
                 destinationInfos.add(info);
             } catch (Exception e) {

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java Wed Mar 22 16:44:59 2006
@@ -42,6 +42,7 @@
 
 import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.gbean.AbstractName;
 
 public class ViewMessagesRenderer extends AbstractJMSManager implements
         PortletRenderer {
@@ -65,9 +66,10 @@
 
         List ret = new ArrayList();
         try {
-            ObjectName adminObjectName = NameFactory.getComponentName(null,
-                    null, destinationApplicationName, NameFactory.JCA_RESOURCE,
-                    destinationModuleName, destinationName, null, baseContext);
+            //TODO configid disabled
+            AbstractName adminObjectName = null;//NameFactory.getComponentName(null,
+//                    null, destinationApplicationName, NameFactory.JCA_RESOURCE,
+//                    destinationModuleName, destinationName, null, baseContext);
             Destination dest = (Destination) kernel.invoke(adminObjectName,
                     "$getResource");
             if (dest instanceof Queue) {
@@ -78,7 +80,7 @@
                 QueueBrowser qBrowser = null;
                 try {
                     qConFactory = (QueueConnectionFactory) kernel.invoke(
-                            ObjectName.getInstance(CONNECTION_FACTORY_NAME),
+                            JCA_MANAGED_CONNECTION_FACTORY_NAME,
                             "$getResource");
                     qConnection = qConFactory.createQueueConnection();
                     qSession = qConnection.createQueueSession(false,
@@ -114,10 +116,11 @@
                     }
                 }
             } else if (dest instanceof Topic) {
-                ObjectName tBrowserObjName = NameFactory.getComponentName(null,
-                        null, destinationApplicationName,
-                        NameFactory.JCA_RESOURCE, destinationModuleName,
-                        destinationName, "TopicBrowser", baseContext);
+                //TODO configid disabled
+                AbstractName tBrowserObjName = null;//NameFactory.getComponentName(null,
+//                        null, destinationApplicationName,
+//                        NameFactory.JCA_RESOURCE, destinationModuleName,
+//                        destinationName, "TopicBrowser", baseContext);
                 ret = (List) kernel.invoke(tBrowserObjName, "getMessages");
             }
         } catch (Exception e) {

Modified: geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Wed Mar 22 16:44:59 2006
@@ -170,7 +170,7 @@
         AbstractName moduleName;
         if (earName == null) {
             earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
-            moduleName = naming.createChildName(earName, NameFactory.APP_CLIENT_MODULE, environment.getConfigId().toString());
+            moduleName = naming.createChildName(earName, environment.getConfigId().toString(), NameFactory.APP_CLIENT_MODULE);
         } else {
             moduleName = naming.createChildName(earName, targetPath, NameFactory.APP_CLIENT_MODULE);
         }

Added: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectSource.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectSource.java?rev=387983&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectSource.java (added)
+++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectSource.java Wed Mar 22 16:44:59 2006
@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed 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.connector;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public interface AdminObjectSource {
+
+    Object $getResource();
+}

Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java (original)
+++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java Wed Mar 22 16:44:59 2006
@@ -33,7 +33,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class AdminObjectWrapper implements DynamicGBean, JCAAdminObject {
+public class AdminObjectWrapper implements DynamicGBean, JCAAdminObject, AdminObjectSource {
 
     private final String adminObjectInterface;
     private final String adminObjectClass;

Added: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionFactorySource.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionFactorySource.java?rev=387983&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionFactorySource.java (added)
+++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionFactorySource.java Wed Mar 22 16:44:59 2006
@@ -0,0 +1,27 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed 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.connector.outbound;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public interface ConnectionFactorySource {
+
+    Object $getResource();
+
+}

Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java (original)
+++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Wed Mar 22 16:44:59 2006
@@ -46,7 +46,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class ManagedConnectionFactoryWrapper implements GBeanLifecycle, DynamicGBean, ResourceManager, JCAManagedConnectionFactory {
+public class ManagedConnectionFactoryWrapper implements GBeanLifecycle, DynamicGBean, ResourceManager, JCAManagedConnectionFactory, ConnectionFactorySource {
 
     private static final Log log = LogFactory.getLog(ManagedConnectionFactoryWrapper.class);
 

Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java (original)
+++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java Wed Mar 22 16:44:59 2006
@@ -29,7 +29,7 @@
 import javax.sql.DataSource;
 import javax.transaction.xa.Xid;
 
-import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
+import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.transaction.manager.LogException;
 import org.apache.geronimo.transaction.manager.Recovery;
@@ -52,9 +52,9 @@
 
     private DataSource dataSource;
     private final String systemId;
-    private final ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper;
+    private final ConnectionFactorySource managedConnectionFactoryWrapper;
 
-    public JDBCLog(String systemId, ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper) {
+    public JDBCLog(String systemId, ConnectionFactorySource managedConnectionFactoryWrapper) {
         this.systemId = systemId;
         this.managedConnectionFactoryWrapper = managedConnectionFactoryWrapper;
     }

Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLogGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLogGBean.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLogGBean.java (original)
+++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLogGBean.java Wed Mar 22 16:44:59 2006
@@ -17,7 +17,7 @@
 
 package org.apache.geronimo.connector.outbound.transactionlog;
 
-import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
+import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -38,9 +38,9 @@
 
         infoFactory.addInterface(TransactionLog.class);
 
-        infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
+        infoFactory.addReference("ConnectionFactorySource", ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
 
-        infoFactory.setConstructor(new String[]{"systemId", "DataSource"});
+        infoFactory.setConstructor(new String[]{"systemId", "ConnectionFactorySource"});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java Wed Mar 22 16:44:59 2006
@@ -212,7 +212,7 @@
         if (fakeReference != null) {
             containerId = fakeReference.containerId;
         }
-        assertEquals(expected.getObjectName().getCanonicalName(), containerId);
+        assertEquals(expected.toURI().toString(), containerId);
     }
 //    private void assertReferenceEqual(String expected, Reference reference) {
 //        FakeReference fakeReference = (FakeReference) reference;

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java Wed Mar 22 16:44:59 2006
@@ -32,7 +32,7 @@
 import java.util.jar.JarFile;
 
 /**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev:386276 $ $Date$
  */
 public class MockWARConfigBuilder extends Assert implements ModuleBuilder {
     private EARContext earContext;
@@ -49,7 +49,7 @@
     }
 
     public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming) throws DeploymentException {
-        AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.EJB_MODULE);
+        AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.WEB_MODULE);
         return new WebModule(false, moduleName, null, moduleFile, targetPath, null, null, null, contextRoot, portMap, namespace);
     }
 

Modified: geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java (original)
+++ geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java Wed Mar 22 16:44:59 2006
@@ -119,6 +119,7 @@
     public static final String CORBA_CSS = "CORBACSS";
     public static final String CORBA_TSS = "CORBATSS";
     public static final String WEB_SERVICE_LINK = "WSLink";
+    public static final String KEY_GENERATOR = "KeyGenerator";
 
 
     /**

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Wed Mar 22 16:44:59 2006
@@ -740,14 +740,14 @@
         if (configName != null) {
             manageableStore.setValue(configName, abstractName, attribute.getAttributeInfo(), value);
         } else {
-            log.error("Unable to identify Configuration for GBean " + abstractName.getObjectName() + ".  Manageable attribute " + attribute.getName() + " was not updated in persistent store.");
+            log.error("Unable to identify Configuration for GBean " + abstractName + ".  Manageable attribute " + attribute.getName() + " was not updated in persistent store.");
         }
     }
 
     private GBeanAttribute getAttributeByName(String name) throws NoSuchAttributeException {
         Integer index = (Integer) attributeIndex.get(name);
         if (index == null) {
-            throw new NoSuchAttributeException("Unknown attribute \"" + name + "\" in gbean " + abstractName.getObjectName());
+            throw new NoSuchAttributeException("Unknown attribute \"" + name + "\" in gbean " + abstractName);
         }
         return attributes[index.intValue()];
     }
@@ -775,7 +775,7 @@
         }
 
         if (state == DESTROYED && !operation.isFramework()) {
-            throw new IllegalStateException("Operations can only be invoke while the GBean instance is running: " + abstractName.getObjectName());
+            throw new IllegalStateException("Operations can only be invoke while the GBean instance is running: " + abstractName);
         }
         return operation.invoke(instance, arguments);
     }
@@ -887,7 +887,7 @@
                 }
                 throw e;
             } catch (IllegalArgumentException e) {
-                log.warn("Constructor mismatch for " + abstractName.getObjectName(), e);
+                log.warn("Constructor mismatch for " + abstractName, e);
                 throw e;
             }
 
@@ -933,7 +933,7 @@
                 try {
                     ((GBeanLifecycle) instance).doFail();
                 } catch (Throwable ignored) {
-                    log.error("Problem in doFail of " + abstractName.getObjectName(), ignored);
+                    log.error("Problem in doFail of " + abstractName, ignored);
                 }
             }
 
@@ -1057,13 +1057,13 @@
                     try {
                         ((GBeanLifecycle) instance).doStop();
                     } catch (Throwable ignored) {
-                        log.error("Problem in doStop of " + abstractName.getObjectName(), ignored);
+                        log.error("Problem in doStop of " + abstractName, ignored);
                     }
                 } else {
                     try {
                         ((GBeanLifecycle) instance).doFail();
                     } catch (Throwable ignored) {
-                        log.error("Problem in doFail of " + abstractName.getObjectName(), ignored);
+                        log.error("Problem in doFail of " + abstractName, ignored);
                     }
                 }
             }

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java Wed Mar 22 16:44:59 2006
@@ -45,7 +45,7 @@
  * Creates proxies that communicate directly with a Kernel located in the same
  * JVM as the client.
  *
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev:386515 $ $Date$
  */
 public class BasicProxyManager implements ProxyManager {
     private final static String MANAGED_BEAN_NAME = "org.apache.geronimo.kernel.proxy.GeronimoManagedBean";
@@ -175,6 +175,13 @@
         Object[] result = new Object[objectNameStrings.length];
         for (int i = 0; i < result.length; i++) {
             result[i] = createProxy(ObjectName.getInstance(objectNameStrings[i]), classLoader);
+        }
+        return result;
+    }
+    public Object[] createProxies(AbstractName[] names, ClassLoader classLoader) {
+        Object[] result = new Object[names.length];
+        for (int i = 0; i < result.length; i++) {
+            result[i] = createProxy(names[i], classLoader);
         }
         return result;
     }

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java Wed Mar 22 16:44:59 2006
@@ -80,6 +80,7 @@
      *         GBeanInfo declares no interfaces
      */
     public Object[] createProxies(String[] objectNameStrings, ClassLoader loader) throws MalformedObjectNameException;
+    public Object[] createProxies(AbstractName[] Names, ClassLoader loader) ;
 
     /**
      * Create a proxy for the specified target, implementing the specified

Modified: geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Wed Mar 22 16:44:59 2006
@@ -26,7 +26,6 @@
 import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.ClassLoading;
-import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.naming.java.ComponentContextBuilder;
@@ -102,7 +101,7 @@
         if (gerGbeanLocator.isSetGbeanLink()) {
             //exact match
             String linkName = gerGbeanLocator.getGbeanLink().trim();
-            abstractNameQuery = buildAbstractNameQuery(null, null, j2eeType, linkName);
+            abstractNameQuery = buildAbstractNameQuery(null, null, linkName, j2eeType);
 
         } else {
             GerPatternType patternType = gerGbeanLocator.getPattern();
@@ -187,9 +186,9 @@
         AbstractNameQuery containerId;
         String module = moduleURI == null ? null : moduleURI.toString();
         if (gerResourceRef == null) {
-            containerId = buildAbstractNameQuery(null, module, type, name);
+            containerId = buildAbstractNameQuery(null, module, name, type);
         } else if (gerResourceRef.isSetResourceLink()) {
-            containerId = buildAbstractNameQuery(null, module, type, gerResourceRef.getResourceLink().trim());
+            containerId = buildAbstractNameQuery(null, module, gerResourceRef.getResourceLink().trim(), type);
         } else {
             //construct name from components
             GerPatternType patternType = gerResourceRef.getPattern();
@@ -228,15 +227,15 @@
     private static AbstractNameQuery getAdminObjectContainerId(String name, GerResourceEnvRefType gerResourceEnvRef) {
         AbstractNameQuery containerId;
         if (gerResourceEnvRef == null) {
-            containerId = buildAbstractNameQuery(null, null, NameFactory.JCA_ADMIN_OBJECT, name);
+            containerId = buildAbstractNameQuery(null, null, name, NameFactory.JCA_ADMIN_OBJECT);
         } else if (gerResourceEnvRef.isSetMessageDestinationLink()) {
-            containerId = buildAbstractNameQuery(null, null, NameFactory.JCA_ADMIN_OBJECT, gerResourceEnvRef.getMessageDestinationLink().trim());
+            containerId = buildAbstractNameQuery(null, null, gerResourceEnvRef.getMessageDestinationLink().trim(), NameFactory.JCA_ADMIN_OBJECT);
         } else if (gerResourceEnvRef.isSetAdminObjectLink()) {
             String moduleURI = null;
             if (gerResourceEnvRef.isSetAdminObjectModule()) {
                 moduleURI = gerResourceEnvRef.getAdminObjectModule().trim();
             }
-            containerId = buildAbstractNameQuery(null, moduleURI, NameFactory.JCA_ADMIN_OBJECT, gerResourceEnvRef.getAdminObjectLink().trim());
+            containerId = buildAbstractNameQuery(null, moduleURI, gerResourceEnvRef.getAdminObjectLink().trim(), NameFactory.JCA_ADMIN_OBJECT);
         } else {
             //construct name from components
             GerPatternType patternType = gerResourceEnvRef.getPattern();
@@ -276,7 +275,7 @@
 
             //try to resolve ref based only matching resource-ref-name
             //throws exception if it can't locate ref.
-            AbstractNameQuery containerId = buildAbstractNameQuery(null, moduleURI, NameFactory.JCA_ADMIN_OBJECT, linkName);
+            AbstractNameQuery containerId = buildAbstractNameQuery(null, moduleURI, linkName, NameFactory.JCA_ADMIN_OBJECT);
             Reference ref = refContext.getAdminObjectRef(containerId, iface, earContext);
             builder.bind(name, ref);
 
@@ -326,7 +325,7 @@
                     AbstractNameQuery cssBean;
                     if (remoteRef.isSetCssLink()) {
                         String cssLink = remoteRef.getCssLink().trim();
-                        cssBean = buildAbstractNameQuery(null, null, NameFactory.CORBA_CSS, cssLink);
+                        cssBean = buildAbstractNameQuery(null, null, cssLink, NameFactory.CORBA_CSS);
                     } else {
                         GerPatternType css = remoteRef.getCss();
                         cssBean = buildAbstractNameQuery(css, NameFactory.CORBA_CSS);
@@ -771,7 +770,7 @@
         return new AbstractNameQuery(artifact, nameMap);
     }
 
-    public static AbstractNameQuery buildAbstractNameQuery(Artifact configId, String module, String type, String name) {
+    public static AbstractNameQuery buildAbstractNameQuery(Artifact configId, String module, String name, String type) {
         Map nameMap = new HashMap();
         nameMap.put("name", name);
         if (type != null) {

Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java (original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java Wed Mar 22 16:44:59 2006
@@ -72,14 +72,18 @@
     }
 
     public String getLoginModuleName() {
-        return kernel.getAbstractNameFor(loginModule).getObjectName().getCanonicalName();
+        //TODO configId which is correct?
+//        return kernel.getAbstractNameFor(loginModule).getObjectName().getCanonicalName();
+        return kernel.getAbstractNameFor(loginModule).toURI().toString();
     }
 
     public String getNextName() {
         if(next == null) {
             return null;
         }
-        return kernel.getAbstractNameFor(next).getObjectName().getCanonicalName();
+        //TODO configId which is correct?
+//        return kernel.getAbstractNameFor(next).getObjectName().getCanonicalName();
+        return kernel.getAbstractNameFor(next).toURI().toString();
     }
 
     public String getControlFlag() {

Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java (original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java Wed Mar 22 16:44:59 2006
@@ -110,7 +110,9 @@
     }
 
     public String getLoginModuleChainName() {
-        return kernel.getAbstractNameFor(loginModuleUse).getObjectName().getCanonicalName();
+        //TODO configid which is correct?
+//        return kernel.getAbstractNameFor(loginModuleUse).getObjectName().getCanonicalName();
+        return kernel.getAbstractNameFor(loginModuleUse).toURI().toString();
     }
 
     /**

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java Wed Mar 22 16:44:59 2006
@@ -83,6 +83,7 @@
     }
 
     public GBeanOverride getGBean(AbstractName gbeanName) {
+        //TODO configid should this use URI?
         return (GBeanOverride) gbeans.get(gbeanName.getObjectName());
     }
 

Modified: geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java (original)
+++ geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java Wed Mar 22 16:44:59 2006
@@ -23,22 +23,22 @@
 import javax.sql.DataSource;
 
 import EDU.oswego.cs.dl.util.concurrent.Executor;
-import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
+import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
 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.timer.NontransactionalExecutorTaskFactory;
 import org.apache.geronimo.timer.PersistentTimer;
 import org.apache.geronimo.timer.ThreadPooledTimer;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
  * @version $Rev$ $Date$
  */
 public class JDBCStoreThreadPooledNonTransactionalTimer extends ThreadPooledTimer {
 
-    public JDBCStoreThreadPooledNonTransactionalTimer(ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper,
+    public JDBCStoreThreadPooledNonTransactionalTimer(ConnectionFactorySource managedConnectionFactoryWrapper,
                                                       TransactionContextManager transactionContextManager,
                                                       Executor threadPool,
                                                       Serializable derbySystem,
@@ -54,7 +54,7 @@
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(JDBCStoreThreadPooledNonTransactionalTimer.class);
         infoFactory.addInterface(PersistentTimer.class);
 
-        infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
+        infoFactory.addReference("ManagedConnectionFactoryWrapper", ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
         infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
         infoFactory.addReference("DerbySystem", Serializable.class, NameFactory.GERONIMO_SERVICE);

Modified: geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java?rev=387983&r1=387982&r2=387983&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java (original)
+++ geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java Wed Mar 22 16:44:59 2006
@@ -23,15 +23,15 @@
 import javax.sql.DataSource;
 
 import EDU.oswego.cs.dl.util.concurrent.Executor;
-import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
+import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
 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.transaction.context.TransactionContextManager;
 import org.apache.geronimo.timer.PersistentTimer;
 import org.apache.geronimo.timer.ThreadPooledTimer;
 import org.apache.geronimo.timer.TransactionalExecutorTaskFactory;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.transaction.context.TransactionContextManager;
 
 /**
  *
@@ -43,7 +43,7 @@
 
     public JDBCStoreThreadPooledTransactionalTimer(int repeatCount,
             TransactionContextManager transactionContextManager,
-            ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper,
+            ConnectionFactorySource managedConnectionFactoryWrapper,
             Executor threadPool,
             Serializable derbySystem,
             Kernel kernel) throws SQLException {
@@ -60,7 +60,7 @@
 
         infoFactory.addAttribute("repeatCount", int.class, true);
         infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
-        infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
+        infoFactory.addReference("ManagedConnectionFactoryWrapper", ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
         infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addReference("DerbySystem", Serializable.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addAttribute("kernel", Kernel.class, false);



Mime
View raw message