geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r391894 [2/3] - in /geronimo/branches/1.1: applications/console-core/src/java/org/apache/geronimo/console/util/ applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ applications/console-standard/src/jav...
Date Thu, 06 Apr 2006 04:00:37 GMT
Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java Wed Apr  5 21:00:33 2006
@@ -19,6 +19,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
+import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
@@ -26,9 +27,8 @@
 import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.WriteableRepository;
-import org.apache.geronimo.management.J2EEDomain;
 import org.apache.geronimo.management.ResourceAdapter;
-import org.apache.geronimo.management.geronimo.EJBManager;
+import org.apache.geronimo.management.geronimo.J2EEDomain;
 import org.apache.geronimo.management.geronimo.J2EEServer;
 import org.apache.geronimo.management.geronimo.JCAAdminObject;
 import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
@@ -42,11 +42,7 @@
 import org.apache.geronimo.management.geronimo.WebConnector;
 import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
-import org.apache.geronimo.pool.GeronimoExecutor;
-import org.apache.geronimo.security.realm.SecurityRealm;
 import org.apache.geronimo.system.logging.SystemLog;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.gbean.AbstractName;
 
 import javax.enterprise.deploy.spi.DeploymentManager;
 import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
@@ -64,7 +60,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.net.URI;
 
 /**
  * @version $Rev$ $Date$
@@ -136,8 +131,7 @@
     public static J2EEServer getCurrentServer(PortletRequest request) {
         J2EEServer server = (J2EEServer) request.getPortletSession(true).getAttribute(SERVER_KEY, PortletSession.APPLICATION_SCOPE);
         if (server == null) {
-            ManagementHelper helper = getManagementHelper(request);
-            server = helper.getServers(getCurrentDomain(request))[0]; //todo: some day, select a server from the domain
+            server = getCurrentDomain(request).getServerInstances()[0]; //todo: some day, select a server from the domain
             request.getPortletSession().setAttribute(SERVER_KEY, server, PortletSession.APPLICATION_SCOPE);
         } else {
             // to do     handle "should not occur" error   - message?
@@ -155,21 +149,6 @@
         return jvm;
     }
 
-    public static Repository[] getRepositories(PortletRequest request) {
-        ManagementHelper helper = getManagementHelper(request);
-        return helper.getRepositories(getCurrentServer(request));
-    }
-
-    public static SecurityRealm[] getSecurityRealms(PortletRequest request) {
-        ManagementHelper helper = getManagementHelper(request);
-        return helper.getSecurityRealms(getCurrentServer(request));
-    }
-
-    public static ServerInfo getServerInfo(PortletRequest request) {
-        ManagementHelper helper = getManagementHelper(request);
-        return helper.getServerInfo(getCurrentServer(request));
-    }
-
     public static void testLoginModule(PortletRequest request, LoginModule module, Map options) {
         ManagementHelper helper = getManagementHelper(request);
         helper.testLoginModule(getCurrentServer(request), module, options);
@@ -181,8 +160,7 @@
     }
 
     public static ListableRepository[] getListableRepositories(PortletRequest request) {
-        ManagementHelper helper = getManagementHelper(request);
-        Repository[] list = helper.getRepositories(getCurrentServer(request));
+        Repository[] list = getCurrentServer(request).getRepositories();
         List result = new ArrayList();
         for (int i = 0; i < list.length; i++) {
             Repository repository = list[i];
@@ -194,8 +172,7 @@
     }
 
     public static WriteableRepository[] getWritableRepositories(PortletRequest request) {
-        ManagementHelper helper = getManagementHelper(request);
-        Repository[] list = helper.getRepositories(getCurrentServer(request));
+        Repository[] list = getCurrentServer(request).getRepositories();
         List result = new ArrayList();
         for (int i = 0; i < list.length; i++) {
             Repository repository = list[i];
@@ -226,12 +203,12 @@
         return helper.getOutboundFactories(getCurrentServer(request), iface);
     }
 
-    public static JCAManagedConnectionFactory[] getOutboundFactoriesForRA(PortletRequest request, String resourceAdapterModuleName) {
+    public static JCAManagedConnectionFactory[] getOutboundFactoriesForRA(PortletRequest request, AbstractName resourceAdapterModuleName) {
         ManagementHelper helper = getManagementHelper(request);
         return helper.getOutboundFactories((ResourceAdapterModule) helper.getObject(resourceAdapterModuleName));
     }
 
-    public static JCAManagedConnectionFactory[] getOutboundFactoriesForRA(PortletRequest request, String resourceAdapterModuleName, String iface) {
+    public static JCAManagedConnectionFactory[] getOutboundFactoriesForRA(PortletRequest request, AbstractName resourceAdapterModuleName, String iface) {
         ManagementHelper helper = getManagementHelper(request);
         return helper.getOutboundFactories((ResourceAdapterModule) helper.getObject(resourceAdapterModuleName), iface);
     }
@@ -257,138 +234,90 @@
         return helper.getAdminObjects(module, ifaces);
     }
 
-    public static String[] getWebManagerNames(PortletRequest request) {
-        return getCurrentServer(request).getWebManagers();
-    }
-
     public static WebManager[] getWebManagers(PortletRequest request) {
-        ManagementHelper helper = getManagementHelper(request);
-        return helper.getWebManagers(getCurrentServer(request));
-    }
-
-    public static WebManager getWebManager(PortletRequest request, String managerObjectName) {
-        ManagementHelper helper = getManagementHelper(request);
-        return (WebManager) helper.getObject(managerObjectName);
-    }
-
-    public static String[] getWebContainerNames(PortletRequest request, String managerObjectName) {
-        ManagementHelper helper = getManagementHelper(request);
-        WebManager manager = (WebManager) helper.getObject(managerObjectName);
-        AbstractName[] names =  manager.getContainers();
-        return namesToStrings(names);
-    }
-
-    private static String[] namesToStrings(AbstractName[] names) {
-        String[] result = new String[names.length];
-        for (int i = 0; i < names.length; i++) {
-            AbstractName name = names[i];
-            result[i] = name.toURI().toString();
-        }
-        return result;
-    }
-
-    public static WebAccessLog getWebAccessLog(PortletRequest request, String managerObjectName, String containerObjectName) {
-        ManagementHelper helper = getManagementHelper(request);
-        WebManager manager = (WebManager) helper.getObject(managerObjectName);
-        return helper.getWebAccessLog(manager, containerObjectName);
-    }
-
-    public static WebContainer getWebContainer(PortletRequest request, String containerObjectName) {
-        ManagementHelper helper = getManagementHelper(request);
-        return (WebContainer) helper.getObject(containerObjectName);
-    }
-
-    public static WebConnector createWebConnector(PortletRequest request, String managerObjectName, String containerObjectName, String name, String protocol, String host, int port) {
-        ManagementHelper helper = getManagementHelper(request);
-        WebManager manager = (WebManager) helper.getObject(managerObjectName);
-        String objectName = manager.addConnector(new AbstractName(URI.create(containerObjectName)), name, protocol, host, port).toURI().toString();
-        return (WebConnector) helper.getObject(objectName);
-    }
-
-    public static WebConnector[] getWebConnectors(PortletRequest request, String managerObjectName) {
-        ManagementHelper helper = getManagementHelper(request);
-        WebManager manager = (WebManager) helper.getObject(managerObjectName);
-        return helper.getWebConnectors(manager);
+        return getCurrentServer(request).getWebManagers();
     }
 
-    public static WebConnector[] getWebConnectors(PortletRequest request, String managerObjectName, String protocol) {
+    public static WebManager getWebManager(PortletRequest request, AbstractName managerName) {
         ManagementHelper helper = getManagementHelper(request);
-        WebManager manager = (WebManager) helper.getObject(managerObjectName);
-        return helper.getWebConnectors(manager, protocol);
+        return (WebManager) helper.getObject(managerName);
     }
 
-    public static WebConnector[] getWebConnectorsForContainer(PortletRequest request, String managerObjectName, String containerObjectName) {
+//    private static String[] namesToStrings(AbstractName[] names) {
+//        String[] result = new String[names.length];
+//        for (int i = 0; i < names.length; i++) {
+//            AbstractName name = names[i];
+//            result[i] = name.toURI().toString();
+//        }
+//        return result;
+//    }
+//
+    public static WebAccessLog getWebAccessLog(PortletRequest request, AbstractName managerName, AbstractName containerName) {
         ManagementHelper helper = getManagementHelper(request);
-        WebManager manager = (WebManager) helper.getObject(managerObjectName);
-        return helper.getWebConnectorsForContainer(manager, containerObjectName);
+        WebManager manager = (WebManager) helper.getObject(managerName);
+        return manager.getAccessLog((WebContainer) helper.getObject(containerName));
     }
 
-    public static WebConnector[] getWebConnectorsForContainer(PortletRequest request, String managerObjectName, String containerObjectName, String protocol) {
+    public static WebContainer getWebContainer(PortletRequest request, AbstractName containerName) {
         ManagementHelper helper = getManagementHelper(request);
-        WebManager manager = (WebManager) helper.getObject(managerObjectName);
-        return helper.getWebConnectorsForContainer(manager, containerObjectName, protocol);
+        return (WebContainer) helper.getObject(containerName);
     }
 
-    public static EJBManager[] getEJBManagers(PortletRequest request) {
+    public static WebConnector createWebConnector(PortletRequest request, AbstractName managerName, AbstractName containerName, String name, String protocol, String host, int port) {
         ManagementHelper helper = getManagementHelper(request);
-        return helper.getEJBManagers(getCurrentServer(request));
+        WebManager manager = (WebManager) helper.getObject(managerName);
+        return manager.addConnector((WebContainer) helper.getObject(containerName), name, protocol, host, port);
     }
 
-    public static EJBManager getEJBManager(PortletRequest request, String managerObjectName) {
+    public static WebConnector[] getWebConnectors(PortletRequest request, AbstractName managerName) {
         ManagementHelper helper = getManagementHelper(request);
-        return (EJBManager) helper.getObject(managerObjectName);
+        WebManager manager = (WebManager) helper.getObject(managerName);
+        return (WebConnector[]) manager.getConnectors();
     }
 
-    public static String[] getJMSManagerNames(PortletRequest request) {
-        return getCurrentServer(request).getJMSManagers();
-    }
-
-    public static JMSManager getJMSManager(PortletRequest request, String managerObjectName) {
+    public static WebConnector[] getWebConnectors(PortletRequest request, AbstractName managerName, String protocol) {
         ManagementHelper helper = getManagementHelper(request);
-        return (JMSManager) helper.getObject(managerObjectName);
+        WebManager manager = (WebManager) helper.getObject(managerName);
+        return (WebConnector[]) manager.getConnectors(protocol);
     }
 
-    public static String[] getJMSBrokerNames(PortletRequest request, String managerObjectName) {
+    public static WebConnector[] getWebConnectorsForContainer(PortletRequest request, AbstractName managerName, AbstractName containerName, String protocol) {
         ManagementHelper helper = getManagementHelper(request);
-        JMSManager manager = (JMSManager) helper.getObject(managerObjectName);
-        AbstractName[] names =  manager.getContainers();
-        return namesToStrings(names);
+        WebManager manager = (WebManager) helper.getObject(managerName);
+        return (WebConnector[]) manager.getConnectorsForContainer(containerName, protocol);
     }
 
-    public static JMSBroker getJMSBroker(PortletRequest request, String brokerObjectName) {
+    public static JMSBroker getJMSBroker(PortletRequest request, AbstractName brokerName) {
         ManagementHelper helper = getManagementHelper(request);
-        return (JMSBroker) helper.getObject(brokerObjectName);
+        return (JMSBroker) helper.getObject(brokerName);
     }
 
-    public static JMSConnector createJMSConnector(PortletRequest request, String managerObjectName, String containerObjectName, String name, String protocol, String host, int port) {
-        ManagementHelper helper = getManagementHelper(request);
-        JMSManager manager = (JMSManager) helper.getObject(managerObjectName);
-        String objectName = manager.addConnector(containerObjectName, name, protocol, host, port);
-        return (JMSConnector) helper.getObject(objectName);
+    public static JMSConnector createJMSConnector(PortletRequest request, JMSManager manager, AbstractName containerName, String name, String protocol, String host, int port) {
+        return manager.addConnector(getJMSBroker(request, containerName), name, protocol, host, port);
     }
 
-    public static JMSConnector[] getJMSConnectors(PortletRequest request, String managerObjectName) {
+    public static JMSConnector[] getJMSConnectors(PortletRequest request, AbstractName managerName) {
         ManagementHelper helper = getManagementHelper(request);
-        JMSManager manager = (JMSManager) helper.getObject(managerObjectName);
-        return helper.getJMSConnectors(manager);
+        JMSManager manager = (JMSManager) helper.getObject(managerName);
+        return (JMSConnector[]) manager.getConnectors();
     }
 
-    public static JMSConnector[] getJMSConnectors(PortletRequest request, String managerObjectName, String protocol) {
+    public static JMSConnector[] getJMSConnectors(PortletRequest request, AbstractName managerName, String protocol) {
         ManagementHelper helper = getManagementHelper(request);
-        JMSManager manager = (JMSManager) helper.getObject(managerObjectName);
-        return helper.getJMSConnectors(manager, protocol);
+        JMSManager manager = (JMSManager) helper.getObject(managerName);
+        return (JMSConnector[]) manager.getConnectors(protocol);
     }
 
-    public static JMSConnector[] getJMSConnectorsForContainer(PortletRequest request, String managerObjectName, String brokerObjectName) {
+    public static JMSConnector[] getJMSConnectorsForContainer(PortletRequest request, AbstractName managerName, AbstractName brokerName) {
         ManagementHelper helper = getManagementHelper(request);
-        JMSManager manager = (JMSManager) helper.getObject(managerObjectName);
-        return helper.getJMSConnectorsForContainer(manager, brokerObjectName);
+        JMSManager manager = (JMSManager) helper.getObject(managerName);
+        return (JMSConnector[]) manager.getConnectorsForContainer(brokerName);
     }
 
-    public static JMSConnector[] getJMSConnectorsForContainer(PortletRequest request, String managerObjectName, String brokerObjectName, String protocol) {
+    public static JMSConnector[] getJMSConnectorsForContainer(PortletRequest request, AbstractName managerName, AbstractName brokerName, String protocol) {
         ManagementHelper helper = getManagementHelper(request);
-        JMSManager manager = (JMSManager) helper.getObject(managerObjectName);
-        return helper.getJMSConnectorsForContainer(manager, brokerObjectName, protocol);
+        JMSManager manager = (JMSManager) helper.getObject(managerName);
+        return (JMSConnector[]) manager.getConnectorsForContainer(brokerName, protocol);
     }
 
     public static ResourceAdapter[] getResourceAdapters(PortletRequest request, ResourceAdapterModule module) {
@@ -401,12 +330,7 @@
         return helper.getRAResources(adapter);
     }
 
-    public static GeronimoExecutor[] getThreadPools(PortletRequest request) {
-        ManagementHelper helper = getManagementHelper(request);
-        return helper.getThreadPools(getCurrentServer(request));
-    }
-
-    public static String getGBeanDescription(PortletRequest request, String objectName) {
+    public static String getGBeanDescription(PortletRequest request, AbstractName objectName) {
         ManagementHelper helper = getManagementHelper(request);
         return helper.getGBeanDescription(objectName);
     }
@@ -431,18 +355,23 @@
         return results;
     }
 
-    public static GeronimoManagedBean getManagedBean(PortletRequest request, String name) {
+    public static GeronimoManagedBean getManagedBean(PortletRequest request, AbstractName name) {
         ManagementHelper helper = getManagementHelper(request);
         return (GeronimoManagedBean) helper.getObject(name);
     }
 
-    public static Artifact getConfigurationFor(PortletRequest request, String objectName) {
+    public static Artifact getConfigurationFor(PortletRequest request, AbstractName objectName) {
         ManagementHelper helper = getManagementHelper(request);
         return helper.getConfigurationNameFor(objectName);
     }
 
+    public static AbstractName getNameFor(PortletRequest request, Object component) {
+        ManagementHelper helper = getManagementHelper(request);
+        return helper.getNameFor(component);
+    }
+
     public static File getRepositoryEntry(PortletRequest request, String repositoryURI) {
-        Repository[] repos = getRepositories(request);
+        Repository[] repos = getCurrentServer(request).getRepositories();
         Artifact uri = Artifact.create(repositoryURI);
         for (int i = 0; i < repos.length; i++) {
             Repository repo = repos[i];

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java Wed Apr  5 21:00:33 2006
@@ -26,7 +26,7 @@
 public class ConnectorInfo implements Serializable {
     private String description;
     private String displayName;
-    private String objectName;
+    private String abstractName;
     private String protocol;
     private int port;
     private int state;
@@ -47,16 +47,23 @@
         this.protocol = protocol;
     }
 
+    /**
+     * @deprecated Use getAbstractName
+     */
     public String getObjectName() {
-        return objectName;
+        return abstractName;
+    }
+
+    public String getAbstractName() {
+        return abstractName;
     }
 
     public String getDisplayName() {
         return displayName;
     }
 
-    public void setObjectName(String objectName) {
-        this.objectName = objectName;
+    public void setAbstractName(String objectName) {
+        this.abstractName = objectName;
     }
 
     public void setDisplayName(String displayName) {

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java Wed Apr  5 21:00:33 2006
@@ -73,7 +73,7 @@
 
         String server = null;
         if(containerName != null) {
-            WebContainer container = PortletManager.getWebContainer(actionRequest, containerName);
+            WebContainer container = PortletManager.getWebContainer(actionRequest, new AbstractName(URI.create(containerName)));
             server = getWebServerType(container.getClass());
         } else {
             server = "unknown";
@@ -96,7 +96,7 @@
             Integer minThreads = getInteger(actionRequest, "minThreads");
             String name = actionRequest.getParameter("name");
             // Create and configure the connector
-            WebConnector connector = PortletManager.createWebConnector(actionRequest, managerName, containerName, name, protocol, host, port);
+            WebConnector connector = PortletManager.createWebConnector(actionRequest, new AbstractName(URI.create(managerName)), new AbstractName(URI.create(containerName)), name, protocol, host, port);
             connector.setMaxThreads(maxThreads);
             // todo: more configurable HTTP/Jetty values
             if(server.equals(WEB_SERVER_JETTY)) {
@@ -157,7 +157,7 @@
             String objectName = actionRequest.getParameter("objectName");
             // Identify and update the connector
             WebConnector connector = null;
-            WebConnector all[] = PortletManager.getWebConnectors(actionRequest, managerName);
+            WebConnector all[] = PortletManager.getWebConnectors(actionRequest, new AbstractName(URI.create(managerName)));
             for (int i = 0; i < all.length; i++) {
                 WebConnector conn = all[i];
                 if(((GeronimoManagedBean)conn).getObjectName().equals(objectName)) {
@@ -216,7 +216,7 @@
             String objectName = actionRequest.getParameter("name");
             // work with the current connector to start it.
             WebConnector connector = null;
-            WebConnector all[] = PortletManager.getWebConnectors(actionRequest, managerName);
+            WebConnector all[] = PortletManager.getWebConnectors(actionRequest, new AbstractName(URI.create(managerName)));
             for (int i = 0; i < all.length; i++) {
                 WebConnector conn = all[i];
                 if(((GeronimoManagedBean)conn).getObjectName().equals(objectName)) {
@@ -240,7 +240,7 @@
             String objectName = actionRequest.getParameter("name");
             // work with the current connector to stop it.
             WebConnector connector = null;
-            WebConnector all[] = PortletManager.getWebConnectors(actionRequest, managerName);
+            WebConnector all[] = PortletManager.getWebConnectors(actionRequest, new AbstractName(URI.create(managerName)));
             for (int i = 0; i < all.length; i++) {
                 WebConnector conn = all[i];
                 if(((GeronimoManagedBean)conn).getObjectName().equals(objectName)) {
@@ -267,7 +267,7 @@
 
         } else if(mode.equals("delete")) { // User chose to delete a connector
             String objectName = actionRequest.getParameter("name");
-            PortletManager.getWebManager(actionRequest, managerName).removeConnector(new AbstractName(URI.create(objectName)));
+            PortletManager.getWebManager(actionRequest, new AbstractName(URI.create(managerName))).removeConnector(new AbstractName(URI.create(objectName)));
             actionResponse.setRenderParameter("mode", "list");
         }
     }
@@ -299,7 +299,7 @@
             if(managerName != null) renderRequest.setAttribute("managerObjectName", managerName);
             if(containerName != null) renderRequest.setAttribute("containerObjectName", containerName);
 
-            WebContainer container = PortletManager.getWebContainer(renderRequest, containerName);
+            WebContainer container = PortletManager.getWebContainer(renderRequest, new AbstractName(URI.create(containerName)));
             String server = getWebServerType(container.getClass());
             renderRequest.setAttribute("server", server);
 
@@ -328,7 +328,7 @@
             } else if(mode.equals("edit")) {
                 String objectName = renderRequest.getParameter("objectName");
                 WebConnector connector = null;
-                WebConnector all[] = PortletManager.getWebConnectors(renderRequest, managerName);
+                WebConnector all[] = PortletManager.getWebConnectors(renderRequest, new AbstractName(URI.create(managerName)));
                 for (int i = 0; i < all.length; i++) {
                     WebConnector conn = all[i];
                     if(((GeronimoManagedBean)conn).getObjectName().equals(objectName)) {
@@ -339,7 +339,7 @@
                 if(connector == null) {
                     doList(renderRequest, renderResponse);
                 } else {
-                    String displayName = PortletManager.getGBeanDescription(renderRequest, objectName);
+                    String displayName = PortletManager.getGBeanDescription(renderRequest, new AbstractName(URI.create(objectName)));
                     try {
                         ObjectName realName = ObjectName.getInstance(objectName);
                         displayName = realName.getKeyProperty("name");
@@ -397,51 +397,41 @@
         List all = new ArrayList();
         for (int i = 0; i < managers.length; i++) {
             WebManager manager = managers[i];
-            String webManagerName = ((GeronimoManagedBean)manager).getObjectName();
+            AbstractName webManagerName = PortletManager.getNameFor(renderRequest, manager);
 
-            String[] containers = PortletManager.getWebContainerNames(renderRequest, webManagerName);
+            WebContainer[] containers = (WebContainer[]) manager.getContainers();
             for (int j = 0; j < containers.length; j++) {
-                try {
-                    List beans = new ArrayList();
-                    String containerName = containers[j];
-                    String id;
-                    if(containers.length == 1) {
-                        id = manager.getProductName();
-                    } else {
-                        ObjectName containerON = ObjectName.getInstance(containerName);
-                        id = manager.getProductName() + " (" + containerON.getKeyProperty(NameFactory.J2EE_NAME) + ")";
-                    }
-                    ContainerStatus result = new ContainerStatus(id, webManagerName, containerName);
-
-                    WebConnector[] connectors = PortletManager.getWebConnectorsForContainer(renderRequest, webManagerName, containerName);
-                    for (int k = 0; k < connectors.length; k++) {
-                        WebConnector connector = connectors[k];
-                        ConnectorInfo info = new ConnectorInfo();
-                            String objectName = ((GeronimoManagedBean)connector).getObjectName();
-                            info.setObjectName(objectName);
-                            info.setDescription(PortletManager.getGBeanDescription(renderRequest, objectName));
-                            try {
-                                ObjectName realName = ObjectName.getInstance(objectName);
-                                info.setDisplayName(realName.getKeyProperty("name"));
-                            } catch (MalformedObjectNameException e) {
-                                log.error("Bad object name for web connector", e);
-                                info.setDisplayName(info.getDescription());
-                            }
-                            info.setState(((GeronimoManagedBean)connector).getState());
-                            info.setPort(connector.getPort());
-                        try {
-                            info.setProtocol(connector.getProtocol());
-                        } catch (IllegalStateException e) {
-                            info.setProtocol("unknown");
-                        }
-                        beans.add(info);
-                    }
-                    result.setConnectors(beans);
-                    result.setProtocols(manager.getSupportedProtocols());
-                    all.add(result);
-                } catch (MalformedObjectNameException e) {
-                    log.error("Unable to parse ObjectName", e);
+                List beans = new ArrayList();
+                WebContainer container = containers[j];
+                AbstractName containerName = PortletManager.getNameFor(renderRequest, container);
+                String id;
+                if(containers.length == 1) {
+                    id = manager.getProductName();
+                } else {
+                    id = manager.getProductName() + " (" + containerName.getName().get(NameFactory.J2EE_NAME) + ")";
                 }
+                ContainerStatus result = new ContainerStatus(id, webManagerName.toString(), containerName.toString());
+
+                WebConnector[] connectors = (WebConnector[]) manager.getConnectorsForContainer(container);
+                for (int k = 0; k < connectors.length; k++) {
+                    WebConnector connector = connectors[k];
+                    ConnectorInfo info = new ConnectorInfo();
+                    AbstractName abstractName = PortletManager.getNameFor(renderRequest, connector);
+                    info.setAbstractName(abstractName.toString());
+                    info.setDescription(PortletManager.getGBeanDescription(renderRequest, abstractName));
+                    info.setDisplayName((String)abstractName.getName().get(NameFactory.J2EE_NAME));
+                    info.setState(((GeronimoManagedBean)connector).getState());
+                    info.setPort(connector.getPort());
+                    try {
+                        info.setProtocol(connector.getProtocol());
+                    } catch (IllegalStateException e) {
+                        info.setProtocol("unknown");
+                    }
+                    beans.add(info);
+                }
+                result.setConnectors(beans);
+                result.setProtocols(manager.getSupportedProtocols());
+                all.add(result);
             }
         }
         renderRequest.setAttribute("containers", all);
@@ -455,15 +445,15 @@
 
     public final static class ContainerStatus {
         private String name;
-        private String managerObjectName;
-        private String containerObjectName;
+        private String managerAbstractName;
+        private String containerAbstractName;
         private String[] protocols;
         private List connectors;
 
-        public ContainerStatus(String name, String managerObjectName, String containerObjectName) {
+        public ContainerStatus(String name, String managerAbstractName, String containerAbstractName) {
             this.name = name;
-            this.managerObjectName = managerObjectName;
-            this.containerObjectName = containerObjectName;
+            this.managerAbstractName = managerAbstractName;
+            this.containerAbstractName = containerAbstractName;
         }
 
         public String getName() {
@@ -486,12 +476,26 @@
             this.connectors = connectors;
         }
 
+        /**
+         * @deprecated Use getManagerAbstractName
+         */
         public String getManagerObjectName() {
-            return managerObjectName;
+            return managerAbstractName;
         }
 
+        /**
+         * @deprecated Use getContainerAbstractName
+         */
         public String getContainerObjectName() {
-            return containerObjectName;
+            return containerAbstractName;
+        }
+
+        public String getManagerAbstractName() {
+            return managerAbstractName;
+        }
+
+        public String getContainerAbstractName() {
+            return containerAbstractName;
         }
     }
 
@@ -519,7 +523,7 @@
         super.destroy();
     }
 
-    public final static boolean isValid(String s) {
+    public static boolean isValid(String s) {
         return s != null && !s.equals("");
     }
 

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java Wed Apr  5 21:00:33 2006
@@ -17,7 +17,10 @@
 
 package org.apache.geronimo.console.webmanager;
 
-import java.io.IOException;
+import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebManager;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -27,10 +30,7 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
-
-import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.management.geronimo.WebContainer;
+import java.io.IOException;
 
 /**
  * Basic portlet showing statistics for a web container
@@ -45,15 +45,14 @@
     private PortletRequestDispatcher helpView;
 
     public void processAction(ActionRequest actionRequest,
-            ActionResponse actionResponse) throws PortletException, IOException {
+                              ActionResponse actionResponse) throws PortletException, IOException {
         try {
-            String[] names = PortletManager.getWebManagerNames(actionRequest);  //todo: handle multiple
-            if (names != null) {
-                String managerName = names[0];  //todo: handle multiple
-                String[] containers = PortletManager.getWebContainerNames(actionRequest, managerName);  //todo: handle multiple
+            WebManager[] managers = PortletManager.getCurrentServer(actionRequest).getWebManagers();
+            if (managers != null) {
+                WebManager manager = managers[0];  //todo: handle multiple
+                WebContainer[] containers = (WebContainer[]) manager.getContainers();
                 if (containers != null) {
-                    String containerName = containers[0];  //todo: handle multiple
-                    WebContainer container = PortletManager.getWebContainer(actionRequest, containerName);
+                    WebContainer container = containers[0];  //todo: handle multiple
                     String server = getWebServerType(container.getClass());
                     String action = actionRequest.getParameter("stats");
                     if (action != null) {
@@ -93,18 +92,17 @@
     }
 
     protected void doView(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws IOException, PortletException {
+                          RenderResponse renderResponse) throws IOException, PortletException {
         if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
             return;
         }
         try {
-            String[] names = PortletManager.getWebManagerNames(renderRequest);  //todo: handle multiple
-            if (names != null) {
-                String managerName = names[0];  //todo: handle multiple
-                String[] containers = PortletManager.getWebContainerNames(renderRequest, managerName);  //todo: handle multiple
+            WebManager[] managers = PortletManager.getCurrentServer(renderRequest).getWebManagers();
+            if (managers != null) {
+                WebManager manager = managers[0];  //todo: handle multiple
+                WebContainer[] containers = (WebContainer[]) manager.getContainers();
                 if (containers != null) {
-                    String containerName = containers[0];  //todo: handle multiple
-                    WebContainer container = PortletManager.getWebContainer(renderRequest, containerName);
+                    WebContainer container = containers[0];  //todo: handle multiple
                     String server = getWebServerType(container.getClass());
                     StatisticsHelper helper = null;
                     if(server.equals(WEB_SERVER_JETTY)) {
@@ -138,7 +136,7 @@
     }
 
     protected void doHelp(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws PortletException, IOException {
+                          RenderResponse renderResponse) throws PortletException, IOException {
         helpView.include(renderRequest, renderResponse);
     }
 

Modified: geronimo/branches/1.1/modules/connector-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/project.xml?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/connector-builder/project.xml Wed Apr  5 21:00:33 2006
@@ -70,6 +70,12 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

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=391894&r1=391893&r2=391894&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 Apr  5 21:00:33 2006
@@ -174,7 +174,7 @@
         return connectionManagerContainer;
     }
 
-    public String getConnectionManager() {
+    public Object getConnectionManager() {
         try {
             ObjectName mine = ObjectName.getInstance(objectName);
             Properties other = new Properties();
@@ -183,7 +183,7 @@
             other.setProperty(NameFactory.JCA_RESOURCE, mine.getKeyProperty(NameFactory.JCA_RESOURCE));
             other.setProperty(NameFactory.J2EE_TYPE, NameFactory.JCA_CONNECTION_MANAGER);
             other.setProperty(NameFactory.J2EE_NAME, mine.getKeyProperty(NameFactory.J2EE_NAME));
-            return new ObjectName(mine.getDomain(), other).getCanonicalName();
+            return kernel.getProxyManager().createProxy(new ObjectName(mine.getDomain(), other), getClass().getClassLoader());
         } catch (MalformedObjectNameException e) {
             log.error("Unable to construct ObjectName", e);
             return null;

Modified: geronimo/branches/1.1/modules/deploy-jsr88/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/project.xml?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/project.xml (original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/project.xml Wed Apr  5 21:00:33 2006
@@ -86,12 +86,6 @@
 
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>geronimo-deployment</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java (original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java Wed Apr  5 21:00:33 2006
@@ -108,14 +108,12 @@
     }
 
     public void addProgressListener(ProgressListener pol) {
-        ProgressEvent event = null;
+        ProgressEvent event;
         synchronized (this) {
             listeners.add(pol);
             event = this.event;
         }
-        if (event != null) {
-            pol.handleProgressEvent(event);
-        }
+        pol.handleProgressEvent(event);
     }
 
     public synchronized void removeProgressListener(ProgressListener pol) {
@@ -136,7 +134,7 @@
 
     public void doFail(Exception e) {
         if (e instanceof InternalKernelException) {
-            Exception test = (Exception)((InternalKernelException)e).getCause();
+            Exception test = (Exception)e.getCause();
             if(test != null) {
                 e = test;
             }
@@ -289,7 +287,7 @@
      */
     public static void addWebURLs(Kernel kernel, List moduleIDs) {
         Set webApps = null;
-        Map containers = null;
+        Map containers;
         try {
             containers = mapContainersToURLs(kernel);
         } catch (Exception e) {
@@ -364,26 +362,9 @@
         Map containers = new HashMap();
         Set set = kernel.listGBeans(new AbstractNameQuery("org.apache.geronimo.management.geronimo.WebManager"));
         for (Iterator it = set.iterator(); it.hasNext();) {
-            AbstractName mgrName = (AbstractName) it.next();
-            AbstractName[] cntNames = (AbstractName[]) kernel.getAttribute(mgrName, "containers");
-            for (int i = 0; i < cntNames.length; i++) {
-                AbstractName cntName = cntNames[i];
-                AbstractName[] cncNames = (AbstractName[]) kernel.invoke(mgrName, "getConnectorsForContainer", new Object[]{cntName}, new String[]{AbstractName.class.getName()});
-                Map map = new HashMap();
-                for (int j = 0; j < cncNames.length; j++) {
-                    AbstractName cncName = cncNames[j];
-                    String protocol = (String) kernel.getAttribute(cncName, "protocol");
-                    String url = (String) kernel.getAttribute(cncName, "connectUrl");
-                    map.put(protocol, url);
-                }
-                String urlPrefix = "";
-                if((urlPrefix = (String) map.get("HTTP")) == null) {
-                    if((urlPrefix = (String) map.get("HTTPS")) == null) {
-                        urlPrefix = (String) map.get("AJP");
-                    }
-                }
-                containers.put(cntName, urlPrefix);
-            }
+            AbstractName manager = (AbstractName) it.next();
+            Map results = (Map)kernel.invoke(manager, "mapContainersToURLs");
+            containers.putAll(results);
         }
         return containers;
     }

Modified: geronimo/branches/1.1/modules/j2ee/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/project.xml?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/project.xml (original)
+++ geronimo/branches/1.1/modules/j2ee/project.xml Wed Apr  5 21:00:33 2006
@@ -93,6 +93,12 @@
         </dependency>
 
         <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>${concurrent_version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j_version}</version>

Modified: geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java (original)
+++ geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java Wed Apr  5 21:00:33 2006
@@ -25,7 +25,8 @@
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.management.J2EEDomain;
+import org.apache.geronimo.management.geronimo.J2EEDomain;
+import org.apache.geronimo.management.geronimo.J2EEServer;
 
 /**
  * @version $Rev$ $Date$
@@ -82,6 +83,10 @@
 
     public String[] getServers() {
         return Util.getObjectNames(kernel, baseName, new String[]{"J2EEServer"});
+    }
+
+    public J2EEServer[] getServerInstances() {
+        return (J2EEServer[]) Util.getObjects(kernel, baseName, new String[]{"J2EEServer"}, J2EEServer.class);
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java (original)
+++ geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java Wed Apr  5 21:00:33 2006
@@ -20,6 +20,7 @@
 import java.util.Hashtable;
 import java.util.Set;
 import java.util.Iterator;
+import java.lang.reflect.Array;
 import javax.management.ObjectName;
 
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -27,6 +28,7 @@
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -35,6 +37,11 @@
 import org.apache.geronimo.management.geronimo.EJBManager;
 import org.apache.geronimo.management.geronimo.JMSManager;
 import org.apache.geronimo.management.geronimo.WebManager;
+import org.apache.geronimo.management.geronimo.SecurityRealm;
+import org.apache.geronimo.management.geronimo.LoginService;
+import org.apache.geronimo.management.geronimo.JVM;
+import org.apache.geronimo.management.J2EEDeployedObject;
+import org.apache.geronimo.management.J2EEResource;
 import org.apache.geronimo.pool.GeronimoExecutor;
 
 /**
@@ -105,46 +112,60 @@
                 new String[]{"J2EEApplication", "AppClientModule", "EJBModule", "WebModule", "ResourceAdapterModule"});
     }
 
+    public J2EEDeployedObject[] getDeployedObjectInstances() {
+        return (J2EEDeployedObject[]) Util.getObjects(kernel, baseName,
+                new String[]{"J2EEApplication", "AppClientModule", "EJBModule", "WebModule", "ResourceAdapterModule"}, J2EEDeployedObject.class);
+    }
+
     public String[] getResources() {
         return Util.getObjectNames(kernel,
                 baseName,
                 new String[]{"JCAResource", "JavaMailResource", "JDBCResource", "JMSResource", "JNDIResource", "JTAResource", "RMI_IIOPResource", "URLResource"});
     }
 
+    public J2EEResource[] getResourceInstances() {
+        return (J2EEResource[]) Util.getObjects(kernel, baseName,
+                new String[]{"JCAResource", "JavaMailResource", "JDBCResource", "JMSResource", "JNDIResource", "JTAResource", "RMI_IIOPResource", "URLResource"}, J2EEResource.class);
+    }
+
     public String[] getJavaVMs() {
         return Util.getObjectNames(kernel, baseName, new String[]{"JVM"});
     }
 
-    public String[] getWebManagers() {
-        return getObjectNames(WebManager.class.getName(), false);
+    public JVM[] getJavaVMInstances() {
+        return (JVM[]) Util.getObjects(kernel, baseName, new String[]{"JVM"}, JVM.class);
+    }
+
+    public WebManager[] getWebManagers() {
+        return (WebManager[]) getObjects(WebManager.class, false);
     }
 
-    public String[] getEJBManagers() {
-        return getObjectNames(EJBManager.class.getName(), false);
+    public EJBManager[] getEJBManagers() {
+        return (EJBManager[]) getObjects(EJBManager.class, false);
     }
 
-    public String[] getJMSManagers() {
-        return getObjectNames(JMSManager.class.getName(), false);
+    public JMSManager[] getJMSManagers() {
+        return (JMSManager[]) getObjects(JMSManager.class, false);
     }
 
-    public String[] getThreadPools() {
-        return getObjectNames(GeronimoExecutor.class.getName(), true);
+    public GeronimoExecutor[] getThreadPools() {
+        return (GeronimoExecutor[]) getObjects(GeronimoExecutor.class, true);
     }
 
-    public String[] getRepositories() {
-        return getObjectNames(Repository.class.getName(), true);
+    public Repository[] getRepositories() {
+        return (Repository[]) getObjects(Repository.class, true);
     }
 
-    public String[] getSecurityRealms() {
-        return getObjectNames("org.apache.geronimo.security.realm.SecurityRealm", true);
+    public SecurityRealm[] getSecurityRealms() {
+        return (SecurityRealm[]) getObjects(SecurityRealm.class, true);
     }
 
-    public String getServerInfo() {
-        return getObjectName(ServerInfo.class.getName());
+    public ServerInfo getServerInfo() {
+        return (ServerInfo) getObject(ServerInfo.class);
     }
 
-    public String getLoginService() {
-        return getObjectName("org.apache.geronimo.security.jaas.server.JaasLoginServiceMBean");
+    public LoginService getLoginService() {
+        return (LoginService) getObject(LoginService.class);
     }
 
     public String getServerVendor() {
@@ -155,31 +176,32 @@
         return serverInfo.getVersion();
     }
 
-    private String getObjectName(String type) {
-        Set names = kernel.listGBeans(new AbstractNameQuery(type));
+    private Object getObject(Class type) {
+        Set names = kernel.listGBeans(new AbstractNameQuery(type.getName()));
         if (names.isEmpty()) {
             return null;
         }
         AbstractName name = (AbstractName) names.iterator().next();
-        return name.getObjectName().getCanonicalName();
+        return kernel.getProxyManager().createProxy(name, type);
     }
 
-    private String[] getObjectNames(String type, boolean returnEmpty) {
-        Set names = kernel.listGBeans(new AbstractNameQuery(type));
+    private Object[] getObjects(Class type, boolean returnEmpty) {
+        Set names = kernel.listGBeans(new AbstractNameQuery(type.getName()));
 
         if(names.size() == 0) {
             if (returnEmpty) {
-                return new String[0];
+                return (Object[]) Array.newInstance(type, 0);
             } else {
                 return null;
             }
         }
 
-        String[] results = new String[names.size()];
+        Object[] results = (Object[]) Array.newInstance(type, names.size());
+        ProxyManager mgr = kernel.getProxyManager();
         int i=0;
         for (Iterator it = names.iterator(); it.hasNext();) {
             AbstractName name = (AbstractName) it.next();
-            results[i++] = name.getObjectName().getCanonicalName();
+            results[i++] = mgr.createProxy(name, type.getClassLoader());
         }
         return results;
     }

Modified: geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/Util.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/Util.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/Util.java (original)
+++ geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/Util.java Wed Apr  5 21:00:33 2006
@@ -18,12 +18,14 @@
 package org.apache.geronimo.j2ee.management.impl;
 
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.proxy.ProxyManager;
 
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.lang.reflect.Array;
 
 /**
  * @version $Rev$ $Date$
@@ -47,6 +49,27 @@
             names[i] = iterator.next().toString();
         }
         return names;
+    }
+
+
+    public static Object[] getObjects(Kernel kernel, Object parentName, String[] j2eeTypes, Class target) {
+        List objectNames = new LinkedList();
+        for (int i = 0; i < j2eeTypes.length; i++) {
+            String j2eeType = j2eeTypes[i];
+            String name = parentName + "j2eeType=" + j2eeType + ",*";
+            try {
+                objectNames.addAll(kernel.listGBeans(new ObjectName(name)));
+            } catch (MalformedObjectNameException e) {
+                throw new IllegalArgumentException("Malformed ObjectName: " + name);
+            }
+        }
+        Object[] objects = (Object[]) Array.newInstance(target,objectNames.size());
+        ProxyManager pm = kernel.getProxyManager();
+        Iterator iterator = objectNames.iterator();
+        for (int i = 0; iterator.hasNext(); i++) {
+            objects[i] = pm.createProxy((ObjectName)iterator.next(), target.getClassLoader());
+        }
+        return objects;
     }
 
 

Modified: geronimo/branches/1.1/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/project.xml?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/project.xml Wed Apr  5 21:00:33 2006
@@ -178,6 +178,12 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java (original)
+++ geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java Wed Apr  5 21:00:33 2006
@@ -32,16 +32,23 @@
 import org.apache.geronimo.jetty.requestlog.JettyLogManager;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.EditableConfigurationManager;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.management.geronimo.WebManager;
+import org.apache.geronimo.management.geronimo.NetworkConnector;
+import org.apache.geronimo.management.geronimo.WebConnector;
+import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebAccessLog;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.Collections;
+import java.util.Map;
+import java.util.HashMap;
 
 /**
  * Jetty implementation of WebManager.  Knows how to manipulate
@@ -66,7 +73,8 @@
      * the connector may well require further customization before being fully
      * functional (e.g. SSL settings for an HTTPS connector).
      */
-    public AbstractName addConnector(AbstractName containerName, String uniqueName, String protocol, String host, int port) {
+    public WebConnector addConnector(WebContainer container, String uniqueName, String protocol, String host, int port) {
+        AbstractName containerName = kernel.getAbstractNameFor(container);
         AbstractName name = kernel.getNaming().createChildName(containerName, "JettyWebConnector-" + protocol + "-" + uniqueName, NameFactory.GERONIMO_SERVICE);
         GBeanData connector;
         if (protocol.equals(PROTOCOL_HTTP)) {
@@ -90,7 +98,7 @@
         if(mgr != null) {
             try {
                 mgr.addGBeanToConfiguration(containerName.getArtifact(), connector, false);
-                return name;
+                return (WebConnector) kernel.getProxyManager().createProxy(name, JettyWebConnector.class.getClassLoader());
             } catch (InvalidConfigException e) {
                 log.error("Unable to add GBean", e);
                 return null;
@@ -106,10 +114,17 @@
     /**
      * Get a list of containers for this web implementation.
      */
-    public AbstractName[] getContainers() {
+    public Object[] getContainers() {
+        ProxyManager proxyManager = kernel.getProxyManager();
         AbstractNameQuery query = new AbstractNameQuery(JettyContainer.class.getName());
         Set names = kernel.listGBeans(query);
-        return (AbstractName[]) names.toArray(new AbstractName[names.size()]);
+        JettyContainer[] results = new JettyContainer[names.size()];
+        int i=0;
+        for (Iterator it = names.iterator(); it.hasNext(); i++) {
+            AbstractName name = (AbstractName) it.next();
+            results[i] = (JettyContainer) proxyManager.createProxy(name, JettyContainer.class.getClassLoader());
+        }
+        return results;
     }
 
     /**
@@ -165,27 +180,28 @@
      *
      * @param protocol A protocol as returned by getSupportedProtocols
      */
-    public AbstractName[] getConnectors(String protocol) {
+    public NetworkConnector[] getConnectors(String protocol) {
         if(protocol == null) {
             return getConnectors();
         }
+        List result = new ArrayList();
+        ProxyManager proxyManager = kernel.getProxyManager();
         AbstractNameQuery query = new AbstractNameQuery(JettyWebConnector.class.getName());
         Set names = kernel.listGBeans(query);
-        List result = new ArrayList();
         for (Iterator it = names.iterator(); it.hasNext();) {
             AbstractName name = (AbstractName) it.next();
             try {
                 if (kernel.getAttribute(name, "protocol").equals(protocol)) {
-                    result.add(name);
+                    result.add(proxyManager.createProxy(name, JettyWebConnector.class.getClassLoader()));
                 }
             } catch (Exception e) {
                 log.error("Unable to check the protocol for a connector", e);
             }
         }
-        return (AbstractName[]) result.toArray(new AbstractName[result.size()]);
+        return (JettyWebConnector[]) result.toArray(new JettyWebConnector[names.size()]);
     }
 
-    public AbstractName getAccessLog(String containerObjectName) {
+    public WebAccessLog getAccessLog(WebContainer container) {
         AbstractNameQuery query = new AbstractNameQuery(JettyLogManager.class.getName());
         Set names = kernel.listGBeans(query);
         if(names.size() == 0) {
@@ -193,22 +209,31 @@
         } else if(names.size() > 1) {
             throw new IllegalStateException("Should not be more than one Jetty access log manager");
         }
-        return (AbstractName)names.iterator().next();
+        return (WebAccessLog) kernel.getProxyManager().createProxy((AbstractName)names.iterator().next(), JettyLogManager.class.getClassLoader());
     }
 
     /**
      * Gets the ObjectNames of any existing connectors.
      */
-    public AbstractName[] getConnectors() {
+    public NetworkConnector[] getConnectors() {
+        ProxyManager proxyManager = kernel.getProxyManager();
         AbstractNameQuery query = new AbstractNameQuery(JettyWebConnector.class.getName());
         Set names = kernel.listGBeans(query);
-        return (AbstractName[]) names.toArray(new AbstractName[names.size()]);
+        JettyWebConnector[] results = new JettyWebConnector[names.size()];
+        int i=0;
+        for (Iterator it = names.iterator(); it.hasNext(); i++) {
+            AbstractName name = (AbstractName) it.next();
+            results[i] = (JettyWebConnector) proxyManager.createProxy(name, JettyWebConnector.class.getClassLoader());
+        }
+        return results;
     }
 
-    public AbstractName[] getConnectorsForContainer(AbstractName containerName, String protocol) {
+    public NetworkConnector[] getConnectorsForContainer(Object container, String protocol) {
         if(protocol == null) {
-            return getConnectorsForContainer(containerName);
+            return getConnectorsForContainer(container);
         }
+        AbstractName containerName = kernel.getAbstractNameFor(container);
+        ProxyManager mgr = kernel.getProxyManager();
         try {
             List results = new ArrayList();
             AbstractNameQuery query = new AbstractNameQuery(JettyWebConnector.class.getName());
@@ -221,7 +246,7 @@
                     try {
                         String testProtocol = (String) kernel.getAttribute(name, "protocol");
                         if(testProtocol != null && testProtocol.equals(protocol)) {
-                            results.add(name);
+                            results.add(mgr.createProxy(name, JettyWebConnector.class.getClassLoader()));
                         }
                     } catch (Exception e) {
                         log.error("Unable to look up protocol for connector '"+name+"'",e);
@@ -229,13 +254,15 @@
                     break;
                 }
             }
-            return (AbstractName[]) results.toArray(new AbstractName[results.size()]);
+            return (JettyWebConnector[]) results.toArray(new JettyWebConnector[results.size()]);
         } catch (Exception e) {
             throw (IllegalArgumentException)new IllegalArgumentException("Unable to look up connectors for Jetty container '"+containerName +"': ").initCause(e);
         }
     }
 
-    public AbstractName[] getConnectorsForContainer(AbstractName containerName) {
+    public NetworkConnector[] getConnectorsForContainer(Object container) {
+        AbstractName containerName = kernel.getAbstractNameFor(container);
+        ProxyManager mgr = kernel.getProxyManager();
         try {
             List results = new ArrayList();
             AbstractNameQuery query = new AbstractNameQuery(JettyWebConnector.class.getName());
@@ -245,13 +272,37 @@
                 GBeanData data = kernel.getGBeanData(name);
                 ReferencePatterns refs = data.getReferencePatterns(JettyConnector.CONNECTOR_CONTAINER_REFERENCE);
                 if (containerName.equals(refs.getAbstractName())) {
-                    results.add(name);
+                    results.add(mgr.createProxy(name, JettyWebConnector.class.getClassLoader()));
                 }
             }
-            return (AbstractName[]) results.toArray(new AbstractName[results.size()]);
+            return (JettyWebConnector[]) results.toArray(new JettyWebConnector[results.size()]);
         } catch (Exception e) {
-            throw (IllegalArgumentException) new IllegalArgumentException("Unable to look up connectors for Jetty container '"+containerName).initCause(e);
+            throw (IllegalArgumentException) new IllegalArgumentException("Unable to look up connectors for Jetty container '"+containerName+"'").initCause(e);
+        }
+    }
+
+    public Map mapContainersToURLs() {
+        WebContainer[] webContainers = (WebContainer[]) getContainers();
+        Map results = new HashMap();
+        for (int i = 0; i < webContainers.length; i++) {
+            WebContainer container = webContainers[i];
+            WebConnector[] connectors = (WebConnector[]) getConnectorsForContainer(container);
+            Map map = new HashMap();
+            for (int j = 0; j < connectors.length; j++) {
+                WebConnector connector = connectors[j];
+                String protocol = connector.getProtocol();
+                String url = connector.getConnectUrl();
+                map.put(protocol, url);
+            }
+            String urlPrefix;
+            if((urlPrefix = (String) map.get("HTTP")) == null) {
+                if((urlPrefix = (String) map.get("HTTPS")) == null) {
+                    urlPrefix = (String) map.get("AJP");
+                }
+            }
+            results.put(kernel.getAbstractNameFor(container).getObjectName().getCanonicalName(), urlPrefix);
         }
+        return results;
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/branches/1.1/modules/management/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/management/project.xml?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/management/project.xml (original)
+++ geronimo/branches/1.1/modules/management/project.xml Wed Apr  5 21:00:33 2006
@@ -49,6 +49,16 @@
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimo_version}</version>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
     </dependencies>
 
     <build>

Added: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEDomain.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEDomain.java?rev=391894&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEDomain.java (added)
+++ geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEDomain.java Wed Apr  5 21:00:33 2006
@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright 2005 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.management.geronimo;
+
+/**
+ * Geronimo extension of the standard J2EEDomain class.
+ *
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public interface J2EEDomain extends org.apache.geronimo.management.J2EEDomain {
+    public J2EEServer[] getServerInstances();
+}

Propchange: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEDomain.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java (original)
+++ geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java Wed Apr  5 21:00:33 2006
@@ -16,6 +16,12 @@
  */
 package org.apache.geronimo.management.geronimo;
 
+import org.apache.geronimo.management.J2EEDeployedObject;
+import org.apache.geronimo.management.J2EEResource;
+import org.apache.geronimo.pool.GeronimoExecutor;
+import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+
 /**
  * Geronimo-specific extensions to the standard J2EE server management
  * interface.
@@ -24,31 +30,43 @@
  */
 public interface J2EEServer extends org.apache.geronimo.management.J2EEServer {
     /**
-     * Gets the ObjectName of the Web Container associated with this
-     * J2EEServer, or null if there is none in the current server
-     * configuration.
-     *
-     * @return The ObjectName of the web container, in String form.
+     * A list of all of the J2EEApplication and J2EEModule types deployed on this J2EEServer.
+     * @see "JSR77.3.3.1.1"
+     * @return the deployed objects on this server
      */
-    public String[] getWebManagers();
+    J2EEDeployedObject[] getDeployedObjectInstances();
 
     /**
-     * Gets the ObjectName of the EJB Container associated with this
-     * J2EEServer, or null if there is none in the current server
-     * configuration.
-     *
-     * @return The ObjectName of the EJB container, in String form.
+     * A list of resources available to this server.
+     * @see "JSR77.3.3.1.2"
+     * @return the resources available to this server
      */
-    public String[] getEJBManagers();
+    J2EEResource[] getResourceInstances();
 
     /**
-     * Gets the ObjectName of the JMS Manager associated with this
-     * J2EEServer, or null if there is none in the current server
-     * configuration.
-     *
-     * @return The ObjectName of the JMS Manager, in String form.
+     * A list of all Java virtual machines on which this J2EEServer has running threads.
+     * @see "JSR77.3.3.1.3"
+     * @return the JVMs for this server
+     */
+    JVM[] getJavaVMInstances();
+
+    /**
+     * Gets the Web Managers associated with this J2EEServer, or null if
+     * there are none in the current server configuration.
+     */
+    public WebManager[] getWebManagers();
+
+    /**
+     * Gets the EJB Managers associated with this J2EEServer, or null if
+     * there are none in the current server configuration.
      */
-    public String[] getJMSManagers();
+    public EJBManager[] getEJBManagers();
+
+    /**
+     * Gets the JMS Managers associated with this J2EEServer, or null if
+     * there are none in the current server configuration.
+     */
+    public JMSManager[] getJMSManagers();
 
     /**
      * Gets the ObjectNames of the thread pools associated with this
@@ -56,37 +74,26 @@
      *
      * @return The ObjectNames of the thread pools, in String form.
      */
-    public String[] getThreadPools();
+    public GeronimoExecutor[] getThreadPools();
 
     /**
-     * Gets the ObjectNames of the Repositories associated with this
-     * J2EEServer.
-     *
-     * @see org.apache.geronimo.kernel.repository.Repository
-     *
-     * @return The ObjectNames of the repositories, in String form.
+     * Gets the Repositories associated with this J2EEServer.
      */
-    public String[] getRepositories();
+    public Repository[] getRepositories();
 
     /**
-     * Gets the ObjectNames of the SecurityRealms associated with this
-     * J2EEServer.
+     * Gets the SecurityRealms associated with this J2EEServer.
      *
      * @see org.apache.geronimo.security.realm.SecurityRealm
      *
      * @return The ObjectNames of the realms, in String form.
      */
-    public String[] getSecurityRealms();
+    public SecurityRealm[] getSecurityRealms();
 
     /**
-     * Gets the ObjectName of the ServerInfo associated with this
-     * J2EEServer.
-     *
-     * @see org.apache.geronimo.system.serverinfo.ServerInfo
-     *
-     * @return The ObjectName of the ServerInfo, in String form.
+     * Gets the ServerInfo associated with this J2EEServer.
      */
-    public String getServerInfo();
+    public ServerInfo getServerInfo();
 
     /**
      * Gets the ObjectName of the LoginService associated with this
@@ -96,5 +103,5 @@
      *
      * @return The ObjectName of the LoginService, in String form.
      */
-    public String getLoginService();
+    public LoginService getLoginService();
 }

Modified: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAManagedConnectionFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAManagedConnectionFactory.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAManagedConnectionFactory.java (original)
+++ geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAManagedConnectionFactory.java Wed Apr  5 21:00:33 2006
@@ -45,12 +45,12 @@
     public Object getConfigProperty(String property) throws Exception;
 
     /**
-     * Gets the ObjectName of the ConnectionManager associated with this managed
-     * connection factory.  That object should implement
+     * Gets the ConnectionManager associated with this managed
+     * connection factory.  This object should implement
      * javax.resource.spi.ConnectionManager and
      * org.apache.geronimo.connector.outbound.PoolingAttributes
      */
-    public String getConnectionManager();
+    public Object getConnectionManager();
     
     public Object getConnectionFactory();
 }

Modified: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JMSBroker.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JMSBroker.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JMSBroker.java (original)
+++ geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JMSBroker.java Wed Apr  5 21:00:33 2006
@@ -16,10 +16,12 @@
  */
 package org.apache.geronimo.management.geronimo;
 
+import org.apache.geronimo.management.J2EEManagedObject;
+
 /**
  * Represents a JMS broker
  *
  * @version $Rev$ $Date$
  */
-public interface JMSBroker {
+public interface JMSBroker extends J2EEManagedObject {
 }

Modified: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JMSManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JMSManager.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JMSManager.java (original)
+++ geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/JMSManager.java Wed Apr  5 21:00:33 2006
@@ -16,6 +16,8 @@
  */
 package org.apache.geronimo.management.geronimo;
 
+import org.apache.geronimo.gbean.AbstractName;
+
 /**
  * Main entry point for managing a particular JMS implementation.  The manager
  * has features to access JMS brokers (aka servers or containers) as well as
@@ -32,16 +34,14 @@
      * the connector may well require further customization before being fully
      * functional (e.g. SSL settings for a secure connector).
      *
-     * @param brokerObjectName The ObjectName of the broker to add the
-     *                         connector for
-     * @param uniqueName       A name fragment that's unique to this connector
-     * @param protocol         The protocol the connector should be configured
-     *                         for
-     * @param host             The listen host/IP for the connector
-     * @param port             The listen port for the connector
+     * @param broker      The broker to add the connector for
+     * @param uniqueName  A name fragment that's unique to this connector
+     * @param protocol    The protocol the connector should be configured for
+     * @param host        The listen host/IP for the connector
+     * @param port        The listen port for the connector
      *
-     * @return The ObjectName of the newly added connector.  It will be valid
-     *         (loaded) but not started.
+     * @return The newly added connector.  It will be valid (loaded) but not
+     *         started.
      */
-    public String addConnector(String brokerObjectName, String uniqueName, String protocol, String host, int port);
+    public JMSConnector addConnector(JMSBroker broker, String uniqueName, String protocol, String host, int port);
 }

Added: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/LoginService.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/LoginService.java?rev=391894&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/LoginService.java (added)
+++ geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/LoginService.java Wed Apr  5 21:00:33 2006
@@ -0,0 +1,48 @@
+/**
+ *
+ * Copyright 2005 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.management.geronimo;
+
+import java.util.Collection;
+
+/**
+ * A very basic sketch of a login service.
+ *
+ * The meat of this is in a Geronimo-specific extension, but it's not yet clear
+ * how much of that should be moved here to be "portable".
+ *
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public interface LoginService {
+    /**
+     * Return the object name of this login service.
+     *
+     * @return the object name of this service
+     */
+    public String getObjectName();
+
+    public Collection getRealms();
+
+    public void setRealms(Collection realms);
+
+    public int getMaxLoginDurationMillis();
+
+    public void setMaxLoginDurationMillis(int maxLoginDurationMillis);
+
+    public int getExpiredLoginScanIntervalMillis();
+
+    public void setExpiredLoginScanIntervalMillis(int expiredLoginScanIntervalMillis);
+}

Propchange: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/LoginService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkManager.java?rev=391894&r1=391893&r2=391894&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkManager.java (original)
+++ geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkManager.java Wed Apr  5 21:00:33 2006
@@ -30,9 +30,14 @@
  */
 public interface NetworkManager {
     /**
-     * Gets the network containers.
+     * Gets the name of the product that this manager manages.
      */
-    public AbstractName[] getContainers();
+    public String getProductName();
+
+    /**
+     * Gets the network containers (web, EJB, JMS, etc.)
+     */
+    public Object[] getContainers();
 
     /**
      * Gets the protocols which this container can configure connectors for.
@@ -48,32 +53,32 @@
     public void removeConnector(AbstractName connectorName);
 
     /**
-     * Gets the ObjectNames of any existing connectors for this network
+     * Gets any existing connectors for this network
      * technology for the specified protocol.
      *
      * @param protocol A protocol as returned by getSupportedProtocols
      */
-    public AbstractName[] getConnectors(String protocol);
+    public NetworkConnector[] getConnectors(String protocol);
 
     /**
-     * Gets the ObjectNames of any existing connectors associated with this
+     * Gets any existing connectors associated with this
      * network technology.
      */
-    public AbstractName[] getConnectors();
+    public NetworkConnector[] getConnectors();
 
     /**
      * Gets the ObjectNames of any existing connectors for the specified
      * container for the specified protocol.
      *
-     * @param containerName
+     * @param container The container to get connectors for
      * @param protocol A protocol as returned by getSupportedProtocols
      */
-    public AbstractName[] getConnectorsForContainer(AbstractName containerName, String protocol);
+    public NetworkConnector[] getConnectorsForContainer(Object container, String protocol);
 
     /**
      * Gets the ObjectNames of any existing connectors for the specified
      * container.
-     * @param containerName
+     * @param container The container to get connectors for
      */
-    public AbstractName[] getConnectorsForContainer(AbstractName containerName);
+    public NetworkConnector[] getConnectorsForContainer(Object container);
 }

Added: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/SecurityRealm.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/SecurityRealm.java?rev=391894&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/SecurityRealm.java (added)
+++ geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/SecurityRealm.java Wed Apr  5 21:00:33 2006
@@ -0,0 +1,35 @@
+/**
+ *
+ * Copyright 2005 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.management.geronimo;
+
+/**
+ * A security realm in the server.
+ *
+ * todo: I'm not yet sure what should reasonably go in here -- it's not clear what's necessary
+ * for a portable security layer and what's Geronimo-specific.  Currently the meaty extension
+ * interface is in o.a.g.security
+ *
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public interface SecurityRealm {
+    /**
+     * The name of the realm, which must be unique across all realms in the
+     * server.
+     */
+    public String getRealmName();
+
+}

Propchange: geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/SecurityRealm.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message