geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r393387 [1/2] - in /geronimo/branches/1.1: applications/console-core/src/java/org/apache/geronimo/console/util/ applications/console-framework/src/webapp/WEB-INF/data/ applications/console-standard/ applications/console-standard/src/java/or...
Date Wed, 12 Apr 2006 05:21:30 GMT
Author: ammulder
Date: Tue Apr 11 22:21:19 2006
New Revision: 393387

URL: http://svn.apache.org/viewcvs?rev=393387&view=rev
Log:
Initial merge of 388236 from HEAD to 1.1.  Everything builds and runs, but
  there are still some functional errors that need to be cleaned up in the
  new portlets.  GERONIMO-1778

Added:
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/
      - copied from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/
      - copied from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/AJPHandler.java
      - copied, changed from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/AJPHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/BaseApacheHandler.java
      - copied, changed from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/BaseApacheHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ConfigHandler.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ConfigHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/IndexHandler.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/IndexHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ResultsHandler.java
      - copied, changed from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ResultsHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java
      - copied, changed from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/
      - copied from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
      - copied, changed from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ConfigureNewKeyHandler.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ConfigureNewKeyHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ConfirmKeyHandler.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ConfirmKeyHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java
      - copied, changed from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java
      - copied, changed from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/UploadCertificateHandler.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/UploadCertificateHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/apache/
      - copied from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/apache/
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/
      - copied from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/ajpPort.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/ajpPort.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/config.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/config.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/index.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/index.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/results.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/results.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/webApps.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/apache/jk/webApps.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/
      - copied from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/keystore/
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/configureKey.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/keystore/configureKey.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/confirmCertificate.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/keystore/confirmCertificate.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/confirmKey.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/keystore/confirmKey.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/createKeystore.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/keystore/createKeystore.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/unlockKeystore.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/keystore/unlockKeystore.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/uploadCertificate.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/keystore/uploadCertificate.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/viewKeystore.jsp
      - copied unchanged from r388236, geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/keystore/viewKeystore.jsp
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/security/keystores/
      - copied from r388236, geronimo/trunk/assemblies/j2ee-jetty-server/src/var/security/keystores/
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/security/keystores/
      - copied from r388236, geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/security/keystores/
    geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/KeyIsLocked.java
    geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java
    geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreIsLocked.java
    geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreManager.java
    geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/keystore/
      - copied from r388236, geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/keystore/
    geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
      - copied, changed from r388236, geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
    geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
      - copied, changed from r388236, geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
    geronimo/branches/1.1/modules/util/src/java/org/apache/geronimo/util/CertificateUtil.java
      - copied unchanged from r388236, geronimo/trunk/modules/util/src/java/org/apache/geronimo/util/CertificateUtil.java
Modified:
    geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
    geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
    geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
    geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
    geronimo/branches/1.1/applications/console-standard/project.xml
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPageAbstractHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPagePortlet.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/threads/ThreadPoolPortlet.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/portlet.xml
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/web.xml
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/1.1/configs/j2ee-security/project.xml
    geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
    geronimo/branches/1.1/configs/rmi-naming/project.xml
    geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
    geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
    geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
    geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
    geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/Util.java
    geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationInfo.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationStore.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
    geronimo/branches/1.1/modules/kernel/src/test/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java
    geronimo/branches/1.1/modules/kernel/src/test/org/apache/geronimo/kernel/repository/ArtifactResolverTest.java
    geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java
    geronimo/branches/1.1/modules/security/project.xml
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
    geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java

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=393387&r1=393386&r2=393387&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 Tue Apr 11 22:21:19 2006
@@ -16,13 +16,42 @@
  */
 package org.apache.geronimo.console.util;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+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.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.management.State;
+import org.apache.geronimo.kernel.config.ConfigurationInfo;
+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.config.NoSuchStoreException;
+import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.management.AppClientModule;
@@ -50,25 +79,6 @@
 import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
 import org.apache.geronimo.system.logging.SystemLog;
 
-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.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
@@ -777,6 +787,109 @@
 
     public AbstractName getNameFor(Object component) {
         return kernel.getAbstractNameFor(component);
+    }
+
+    public ConfigurationInfo[] getConfigurations(ConfigurationModuleType type, boolean includeChildModules) {
+        ConfigurationManager mgr = ConfigurationUtil.getConfigurationManager(kernel);
+        List stores = mgr.listStores();
+        List results = new ArrayList();
+        for (Iterator i = stores.iterator(); i.hasNext();) {
+            ObjectName storeName = (ObjectName) i.next();
+            try {
+                List infos = mgr.listConfigurations(storeName);
+                for (Iterator j = infos.iterator(); j.hasNext();) {
+                    ConfigurationInfo info = (ConfigurationInfo) j.next();
+                    if(type == null || type.getValue() == info.getType().getValue()) {
+                        results.add(info);
+                    }
+                    if(includeChildModules && (type == null || info.getType().getValue() == ConfigurationModuleType.EAR.getValue())) {
+                        String dest = type.equals(ConfigurationModuleType.EAR) ? "J2EEApplication" :
+                                type.equals(ConfigurationModuleType.EJB) ? "EJBModule" :
+                                type.equals(ConfigurationModuleType.RAR) ? "ResourceAdapterModule" :
+                                type.equals(ConfigurationModuleType.WAR) ? "WebModule" :
+                                type.equals(ConfigurationModuleType.CAR) ? "AppClientModule" : null;
+                        String[] modules = Util.getObjectNames(kernel, "*:", new String[]{dest});
+                        for (int k = 0; k < modules.length; k++) {
+                            String name = modules[k];
+                            if(name.indexOf("J2EEApplication="+info.getConfigID()) > -1) {
+                                ObjectName temp = null;
+                                try {
+                                    temp = ObjectName.getInstance(name);
+                                } catch (MalformedObjectNameException e) {
+                                    throw new IllegalStateException("Bad ObjectName, Should Never Happen: "+e.getMessage());
+                                }
+                                State state;
+                                if (kernel.isLoaded(temp)) {
+                                    try {
+                                        state = State.fromInt(kernel.getGBeanState(temp));
+                                    } catch (Exception e) {
+                                        state = null;
+                                    }
+                                } else {
+                                    // If the configuration is not loaded by the kernel
+                                    // and defined by the store, then it is stopped.
+                                    state = State.STOPPED;
+                                }
+                                results.add(new ConfigurationInfo(info.getStoreName(), Artifact.create(temp.getKeyProperty(NameFactory.J2EE_NAME)), state, type, info.getConfigID()));
+                            }
+                        }
+                    }
+                }
+            } catch (NoSuchStoreException e) {
+                // we just got this list so this should not happen
+                // in the unlikely event it does, just continue
+            }
+        }
+        Collections.sort(results, new Comparator() {
+            public int compare(Object o1, Object o2) {
+                ConfigurationInfo ci1 = (ConfigurationInfo) o1;
+                ConfigurationInfo ci2 = (ConfigurationInfo) o2;
+                return ci1.getConfigID().toString().compareTo(ci2.getConfigID().toString());
+            }
+        });
+        return (ConfigurationInfo[]) results.toArray(new ConfigurationInfo[results.size()]);
+    }
+
+    public J2EEDeployedObject getModuleForConfiguration(Artifact configuration) {
+        ConfigurationManager manager = ConfigurationUtil.getConfigurationManager(kernel);
+        ConfigurationStore store = manager.getStoreForConfiguration(configuration);
+        ObjectName base = kernel.getAbstractNameFor(store).getObjectName();
+        Configuration config = manager.getConfiguration(configuration);
+        Configuration parent = config.getEnclosingConfiguration();
+        ConfigurationModuleType type = config.getModuleType();
+        try {
+            ObjectName module = null;
+            if(type.equals(ConfigurationModuleType.CAR)) {
+                if(parent == null) {
+                    module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication=null,j2eeType=AppClientModule,name="+configuration);
+                } else {
+                    module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication="+parent.getId()+",j2eeType=AppClientModule,name="+configuration);
+                }
+            } else if(type.equals(ConfigurationModuleType.EAR)) {
+                module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication="+configuration+",j2eeType=J2EEApplication,name="+configuration);
+            } else if(type.equals(ConfigurationModuleType.EJB)) {
+                if(parent == null) {
+                    module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication=null,j2eeType=EJBModule,name="+configuration);
+                } else {
+                    module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication="+parent.getId()+",j2eeType=EJBModule,name="+configuration);
+                }
+            } else if(type.equals(ConfigurationModuleType.RAR)) {
+                if(parent == null) {
+                    module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication=null,j2eeType=ResourceAdapterModule,name="+configuration);
+                } else {
+                    module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication="+parent.getId()+",j2eeType=ResourceAdapterModule,name="+configuration);
+                }
+            } else if(type.equals(ConfigurationModuleType.WAR)) {
+                if(parent == null) {
+                    module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication=null,j2eeType=WebModule,name="+configuration);
+                } else {
+                    module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication="+parent.getId()+",j2eeType=WebModule,name="+configuration);
+                }
+            }
+            return (J2EEDeployedObject) kernel.getProxyManager().createProxy(module, getClass().getClassLoader());
+        } catch (MalformedObjectNameException e) {
+            throw new IllegalStateException("Bad config ID: "+e.getMessage());
+        }
     }
 
     /**

Modified: geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java (original)
+++ geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java Tue Apr 11 22:21:19 2006
@@ -16,7 +16,13 @@
  */
 package org.apache.geronimo.console.util;
 
+import java.util.Map;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.kernel.config.ConfigurationInfo;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.management.AppClientModule;
 import org.apache.geronimo.management.EJB;
@@ -31,6 +37,7 @@
 import org.apache.geronimo.management.ResourceAdapter;
 import org.apache.geronimo.management.Servlet;
 import org.apache.geronimo.management.WebModule;
+import org.apache.geronimo.management.J2EEDeployedObject;
 import org.apache.geronimo.management.geronimo.J2EEApplication;
 import org.apache.geronimo.management.geronimo.J2EEDomain;
 import org.apache.geronimo.management.geronimo.J2EEServer;
@@ -41,11 +48,6 @@
 import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
 import org.apache.geronimo.system.logging.SystemLog;
 
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-import java.util.Map;
-
 /**
  * A helper interface to navigate between management objects.  This is not
  * complete; it will be expanded as necessary.
@@ -114,4 +116,6 @@
     Subject testLoginModule(J2EEServer server, LoginModule module, Map options, String username, String password) throws LoginException;
     Object[] findByInterface(Class iface);
     AbstractName getNameFor(Object component);
+    ConfigurationInfo[] getConfigurations(ConfigurationModuleType type, boolean includeChildModules);
+    J2EEDeployedObject getModuleForConfiguration(Artifact configuration);
 }

Modified: geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml (original)
+++ geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml Tue Apr 11 22:21:19 2006
@@ -240,6 +240,20 @@
             </fragment>
         </fragment>
 -->
+        <fragment name="apachejk" type="page">
+            <navigation>
+                <title>Apache HTTP</title>
+                <description>ico_servcomp_16x16.gif Hook Geronimo up to the Apache HTTP server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.68"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+        </fragment>
     </fragment>
 
     <fragment name="services" type="page">
@@ -489,9 +503,24 @@
             </fragment>
         </fragment>
 
+        <fragment name="keystores" type="page">
+            <navigation>
+                <title>Keystores</title>
+                <description>ico_doc_16x16.gif Manage keystores for this server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.69"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+        </fragment>
+
         <fragment name="keystore" type="page">
             <navigation>
-                <title>Keystore</title>
+                <title>Old Keystore</title>
                 <description>ico_doc_16x16.gif Manage the keystore for this server</description>
             </navigation>
 

Modified: geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml (original)
+++ geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml Tue Apr 11 22:21:19 2006
@@ -139,6 +139,12 @@
         <portlet id="67">
             <definition-id>console-standard.JMSWizard</definition-id>
         </portlet>
+        <portlet id="68">
+            <definition-id>console-standard.ApacheJK</definition-id>
+        </portlet>
+        <portlet id="69">
+            <definition-id>console-standard.Keystores</definition-id>
+        </portlet>
 
         <!-- Leave some free numbers for the portlets that are in HEAD but not 1.1 yet -->
         <portlet id="80">

Modified: geronimo/branches/1.1/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/project.xml?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/project.xml (original)
+++ geronimo/branches/1.1/applications/console-standard/project.xml Tue Apr 11 22:21:19 2006
@@ -136,6 +136,11 @@
             <version>${pom.currentVersion}</version>
         </dependency>
         <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-util</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
             <version>${mx4j_version}</version>

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPageAbstractHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPageAbstractHandler.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPageAbstractHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPageAbstractHandler.java Tue Apr 11 22:21:19 2006
@@ -16,6 +16,8 @@
  */
 package org.apache.geronimo.console;
 
+import org.apache.commons.fileupload.portlet.PortletFileUpload;
+
 import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
@@ -25,9 +27,14 @@
 import javax.portlet.RenderResponse;
 import javax.enterprise.deploy.spi.status.ProgressObject;
 import java.io.IOException;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Properties;
 
 /**
- * ReplaceMe
+ * Base class for handlers for the multi page portlet.  Each one is expected
+ * to handle a single page -- the action request before the page is rendered,
+ * the render request, and the action request after the page is rendered.
  *
  * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
  */
@@ -37,6 +44,8 @@
     protected PortletRequestDispatcher view;
     private final String mode;
     private final String viewName;
+    private Map uploadFiles = new HashMap();
+    private Properties uploadFields = new Properties();
 
     protected MultiPageAbstractHandler(String mode, String viewName) {
         this.mode = mode;
@@ -77,6 +86,13 @@
      */
     public abstract String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException;
 
+    public Map getUploadFiles() {
+        return uploadFiles;
+    }
+
+    public Properties getUploadFields() {
+        return uploadFields;
+    }
 
     protected static void waitForProgress(ProgressObject po) {
         while(po.getDeploymentStatus().isRunning()) {

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPagePortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPagePortlet.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPagePortlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/MultiPagePortlet.java Tue Apr 11 22:21:19 2006
@@ -18,6 +18,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -30,6 +34,7 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.io.IOException;
 
 /**
@@ -55,7 +60,32 @@
 
     public void processAction(ActionRequest actionRequest,
                               ActionResponse actionResponse) throws PortletException, IOException {
-        String mode = actionRequest.getParameter(MODE_KEY);
+        String mode = null;
+        Map files = null;
+        Map fields = null;
+        if(actionRequest.getContentType() != null && actionRequest.getContentType().startsWith("multipart/form-data")) {
+            files = new HashMap();
+            fields = new HashMap();
+            PortletFileUpload request = new PortletFileUpload(new DiskFileItemFactory());
+            try {
+                List items = request.parseRequest(actionRequest);
+                for (int i = 0; i < items.size(); i++) {
+                    FileItem item = (FileItem) items.get(i);
+                    if(item.isFormField()) {
+                        if(item.getFieldName().equals(MODE_KEY)) {
+                            mode = item.getString();
+                        }
+                        fields.put(item.getFieldName(), item.getString());
+                    } else {
+                        files.put(item.getFieldName(), item);
+                    }
+                }
+            } catch (FileUploadException e) {
+                log.error("Unable to process form including a file upload", e);
+            }
+        } else {
+            mode = actionRequest.getParameter(MODE_KEY);
+        }
         MultiPageModel model = getModel(actionRequest);
         while(true) {
             if(mode == null) {
@@ -72,6 +102,13 @@
                     log.error("No handler for action mode '"+mode+"'");
                     break;
                 }
+                if(files == null) {
+                    handler.getUploadFields().clear();
+                    handler.getUploadFiles().clear();
+                } else {
+                    handler.getUploadFields().putAll(fields);
+                    handler.getUploadFiles().putAll(files);
+                }
                 log.debug("Using action handler '"+handler.getClass().getName()+"'");
                 if(type.equals("before")) {
                     mode = handler.actionBeforeView(actionRequest, actionResponse, model);
@@ -109,7 +146,7 @@
         } catch (Throwable e) {
             log.error("Unable to render portlet", e);
         }
-        renderRequest.setAttribute("data", model);
+        renderRequest.setAttribute(getModelJSPVariableName(), model);
         if(handler != null) {
             handler.getView().include(renderRequest, renderResponse);
         }
@@ -125,6 +162,8 @@
         if(helpers.containsKey("index")) return "index";
         return null;
     }
+
+    protected abstract String getModelJSPVariableName();
 
     protected abstract MultiPageModel getModel(PortletRequest request);
 }

Copied: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/AJPHandler.java (from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/AJPHandler.java)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/AJPHandler.java?p2=geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/AJPHandler.java&p1=geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/AJPHandler.java&r1=388236&r2=393387&rev=393387&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/AJPHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/AJPHandler.java Tue Apr 11 22:21:19 2006
@@ -16,20 +16,19 @@
  */
 package org.apache.geronimo.console.apache.jk;
 
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.management.geronimo.WebManager;
-import org.apache.geronimo.management.geronimo.WebConnector;
-import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import java.io.IOException;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.management.geronimo.NetworkConnector;
+import org.apache.geronimo.management.geronimo.WebConnector;
+import org.apache.geronimo.management.geronimo.WebManager;
 
 /**
  * ReplaceMe
@@ -48,9 +47,9 @@
         // See if any AJP listeners are defined
         for (int i = 0; i < managers.length; i++) {
             WebManager manager = managers[i];
-            String[] connectors = manager.getConnectors(WebManager.PROTOCOL_AJP);
+            NetworkConnector[] connectors = manager.getConnectors(WebManager.PROTOCOL_AJP);
             if(connectors.length > 0) {
-                log.warn("Found AJP listener on port "+PortletManager.getWebConnector(request, connectors[0]).getPort());
+                log.warn("Found AJP listener on port "+connectors[0].getPort());
                 return BASIC_CONFIG_MODE+BEFORE_ACTION;
             }
         }
@@ -60,7 +59,7 @@
         while(true) {
             for (int i = 0; i < managers.length; i++) {
                 WebManager manager = managers[i];
-                WebConnector[] cons = PortletManager.getWebConnectors(request, ((GeronimoManagedBean)manager).getObjectName());
+                WebConnector[] cons = (WebConnector[]) manager.getConnectors();
                 for (int j = 0; j < cons.length; j++) {
                     WebConnector con = cons[j];
                     if(con.getPort() == port) {
@@ -89,7 +88,7 @@
         WebManager[] managers = PortletManager.getWebManagers(request);
         for (int i = 0; i < managers.length; i++) {
             WebManager manager = managers[i];
-            WebConnector[] cons = PortletManager.getWebConnectors(request, ((GeronimoManagedBean)manager).getObjectName());
+            WebConnector[] cons = (WebConnector[]) manager.getConnectors();
             for (int j = 0; j < cons.length; j++) {
                 WebConnector con = cons[j];
                 if(con.getPort() == model.getAddAjpPort().intValue()) {

Copied: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/BaseApacheHandler.java (from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/BaseApacheHandler.java)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/BaseApacheHandler.java?p2=geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/BaseApacheHandler.java&p1=geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/BaseApacheHandler.java&r1=388236&r2=393387&rev=393387&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/BaseApacheHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/BaseApacheHandler.java Tue Apr 11 22:21:19 2006
@@ -16,17 +16,16 @@
  */
 package org.apache.geronimo.console.apache.jk;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletRequest;
 import org.apache.geronimo.console.MultiPageAbstractHandler;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.util.PortletManager;
 
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-import java.util.List;
-import java.util.Map;
-import java.util.ArrayList;
-import java.io.Serializable;
-
 /**
  * The base class for all handlers for this portlet
  *
@@ -139,11 +138,11 @@
             os = request.getParameter("os");
             logFilePath = request.getParameter("logFilePath");
             if(logFilePath == null) {
-                logFilePath = PortletManager.getServerInfo(request).resolve("var/log/apache_mod_jk.log").getPath();
+                logFilePath = PortletManager.getCurrentServer(request).getServerInfo().resolve("var/log/apache_mod_jk.log").getPath();
             }
             workersPath = request.getParameter("workersPath");
             if(workersPath == null) {
-                workersPath = PortletManager.getServerInfo(request).resolve("var/config/workers.properties").getPath();
+                workersPath = PortletManager.getCurrentServer(request).getServerInfo().resolve("var/config/workers.properties").getPath();
             }
             String ajp = request.getParameter("addAjpPort");
             if(!isEmpty(ajp)) addAjpPort = new Integer(ajp);

Copied: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ResultsHandler.java (from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ResultsHandler.java)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ResultsHandler.java?p2=geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ResultsHandler.java&p1=geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ResultsHandler.java&r1=388236&r2=393387&rev=393387&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ResultsHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/ResultsHandler.java Tue Apr 11 22:21:19 2006
@@ -16,19 +16,16 @@
  */
 package org.apache.geronimo.console.apache.jk;
 
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.kernel.config.ConfigurationInfo;
-import org.apache.geronimo.kernel.config.ConfigurationModuleType;
-import org.apache.geronimo.management.geronimo.WebManager;
-
+import java.io.IOException;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import java.io.IOException;
-import java.util.List;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.management.geronimo.NetworkConnector;
+import org.apache.geronimo.management.geronimo.WebManager;
 
 /**
  * Handler for the screen where you select the webapps to expose through Apache
@@ -55,9 +52,9 @@
             // See if any AJP listeners are defined
             for (int i = 0; i < managers.length; i++) {
                 WebManager manager = managers[i];
-                String[] connectors = manager.getConnectors(WebManager.PROTOCOL_AJP);
+                NetworkConnector[] connectors = manager.getConnectors(WebManager.PROTOCOL_AJP);
                 if(connectors.length > 0) {
-                    port = Integer.toString(PortletManager.getWebConnector(request, connectors[0]).getPort());
+                    port = Integer.toString(connectors[0].getPort());
                     break;
                 }
             }

Copied: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java (from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java?p2=geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java&p1=geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java&r1=388236&r2=393387&rev=393387&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java Tue Apr 11 22:21:19 2006
@@ -16,27 +16,28 @@
  */
 package org.apache.geronimo.console.apache.jk;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
+import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.management.geronimo.WebModule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
-import java.io.IOException;
-import java.io.File;
-import java.util.List;
-import java.net.URI;
 
 /**
  * Handler for the screen where you select the webapps to expose through Apache
@@ -64,22 +65,19 @@
                 if(!app.getState().isRunning()) {
                     continue;
                 }
-                ObjectName base = app.getStoreName();
+                AbstractName storeName = app.getStoreName();
+                ConfigurationStore store = (ConfigurationStore) PortletManager.getManagedBean(request, storeName);
+                WebModule web = (WebModule) PortletManager.getModule(request, app.getConfigID());
                 WebAppData data = new WebAppData(app.getConfigID().toString(), false, null, false);
+                data.setContextRoot(web.getContextPath());
                 try {
-                    ObjectName module = ObjectName.getInstance(base.getDomain()+":J2EEServer="+base.getKeyProperty("J2EEServer")+",J2EEApplication="+app.getParentID()+",j2eeType=WebModule,name="+app.getConfigID());
-                    WebModule web = (WebModule) PortletManager.getManagedBean(request, module.getCanonicalName());
-                    data.setContextRoot(web.getContextPath());
-                    ConfigurationStore store = (ConfigurationStore) PortletManager.getManagedBean(request, app.getStoreName().getCanonicalName());
-                    String path = getPathToConfiguration(store, app.getParentID() == null ? app.getConfigID() : app.getParentID());
+                    String path = getPathToConfiguration(store, app.getParentID() == null ? app.getConfigID() : app.getParentID(), app.getParentID() == null ? null : app.getConfigID());
                     if(app.getParentID() == null) {
                         path = path + File.separator + "web";
                     } else {
                         path = path + File.separator + app.getConfigID();
                     }
                     data.setWebAppDir(path);
-                } catch (MalformedObjectNameException e) {
-                    log.error("I sure didn't expect to get this exception", e);
                 } catch (NoSuchConfigException e) {
                     log.error("I sure didn't expect to get this exception", e);
                 }
@@ -89,8 +87,15 @@
         request.setAttribute("webApps", webApps);
     }
 
-    private String getPathToConfiguration(ConfigurationStore store, URI moduleOrParentID) throws NoSuchConfigException {
-        return "PATH_IN_CONFIG_STORE"; // todo: replace this with code to actually look up the path to the module
+    private String getPathToConfiguration(ConfigurationStore store, Artifact moduleOrParentID, Artifact childID) throws NoSuchConfigException {
+        try {
+            return store.resolve(moduleOrParentID, childID.toString(), new URI("")).getPath();
+        } catch (MalformedURLException e) {
+            log.error("Unable to locate path to web app "+moduleOrParentID+(childID == null ? "" : " / "+childID), e);
+        } catch (URISyntaxException e) {
+            log.error("Unable to locate path to web app "+moduleOrParentID+(childID == null ? "" : " / "+childID), e);
+        }
+        return "PATH_TO_EXPLODED_WAR_IN_REPO";
     }
 
     public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel amodel) throws PortletException, IOException {

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java Tue Apr 11 22:21:19 2006
@@ -42,6 +42,10 @@
         addHelper(new ReviewHandler(), config);
     }
 
+    protected String getModelJSPVariableName() {
+        return "data";
+    }
+
     protected MultiPageModel getModel(PortletRequest request) {
         return new AbstractHandler.JMSResourceData(request);
     }

Copied: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java (from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java?p2=geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java&p1=geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java&r1=388236&r2=393387&rev=393387&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java Tue Apr 11 22:21:19 2006
@@ -16,27 +16,24 @@
  */
 package org.apache.geronimo.console.keystores;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.console.MultiPageAbstractHandler;
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.security.keystore.KeystoreInstance;
-import org.apache.geronimo.util.CertificateUtil;
-
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.io.IOException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
-import java.security.NoSuchAlgorithmException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletRequest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.MultiPageAbstractHandler;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.management.geronimo.KeystoreInstance;
+import org.apache.geronimo.util.CertificateUtil;
 
 /**
  * The base class for all handlers for this portlet

Copied: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java (from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java?p2=geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java&p1=geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java&r1=388236&r2=393387&rev=393387&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java Tue Apr 11 22:21:19 2006
@@ -16,15 +16,14 @@
  */
 package org.apache.geronimo.console.keystores;
 
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.console.util.PortletManager;
-
+import java.io.IOException;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import java.io.IOException;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.util.PortletManager;
 
 /**
  * Handler for entering a password to unlock a keystore
@@ -55,7 +54,7 @@
             response.setRenderParameter("filename", filename);
             return getMode();
         }
-        PortletManager.getKeystoreManager(request).createKeystore(filename, password.toCharArray());
+        PortletManager.getCurrentServer(request).getKeystoreManager().createKeystore(filename, password.toCharArray());
 
         return LIST_MODE+BEFORE_ACTION;
     }

Copied: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java (from r388236, geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java?p2=geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java&p1=geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java&r1=388236&r2=393387&rev=393387&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java Tue Apr 11 22:21:19 2006
@@ -16,17 +16,19 @@
  */
 package org.apache.geronimo.console.keystores;
 
-import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.security.keystore.KeystoreManager;
-
+import java.io.IOException;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
 import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import java.io.IOException;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.management.geronimo.KeystoreInstance;
+import org.apache.geronimo.management.geronimo.KeystoreManager;
 
 /**
  * Handler for the keystore list screen.
@@ -43,19 +45,20 @@
     }
 
     public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        KeystoreManager manager = PortletManager.getKeystoreManager(request);
-        String[] names = manager.listKeystores();
+        KeystoreManager manager = PortletManager.getCurrentServer(request).getKeystoreManager();
+        KeystoreInstance[] keystores = manager.getKeystores();
         PortletSession session = request.getPortletSession(true);
-        KeystoreData[] keystores = new KeystoreData[names.length];
-        for (int i = 0; i < names.length; i++) {
-            String name = names[i];
+        KeystoreData[] datas = new KeystoreData[keystores.length];
+        for (int i = 0; i < datas.length; i++) {
+            AbstractName aName = PortletManager.getNameFor(request, keystores[i]);
+            String name = (String) aName.getName().get(NameFactory.J2EE_NAME);
             KeystoreData data = (KeystoreData) session.getAttribute(KEYSTORE_DATA_PREFIX+name);
             if(data == null) {
                 data = new KeystoreData();
-                data.setInstance(manager.getKeystore(name));
+                data.setInstance(keystores[i]);
                 session.setAttribute(KEYSTORE_DATA_PREFIX+name, data);
             }
-            keystores[i] = data;
+            datas[i] = data;
         }
         request.setAttribute("keystores", keystores);
     }

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/threads/ThreadPoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/threads/ThreadPoolPortlet.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/threads/ThreadPoolPortlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/threads/ThreadPoolPortlet.java Tue Apr 11 22:21:19 2006
@@ -36,4 +36,8 @@
     protected MultiPageModel getModel(PortletRequest request) {
         return new AbstractThreadHandler.ThreadPoolData(request);
     }
+
+    protected String getModelJSPVariableName() {
+        return "model";
+    }
 }

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=393387&r1=393386&r2=393387&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 Tue Apr 11 22:21:19 2006
@@ -16,18 +16,37 @@
  */
 package org.apache.geronimo.console.util;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderResponse;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 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.config.ConfigurationInfo;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
 import org.apache.geronimo.kernel.repository.Artifact;
 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.ResourceAdapter;
+import org.apache.geronimo.management.J2EEDeployedObject;
 import org.apache.geronimo.management.geronimo.J2EEDomain;
 import org.apache.geronimo.management.geronimo.J2EEServer;
 import org.apache.geronimo.management.geronimo.JCAAdminObject;
@@ -44,23 +63,6 @@
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.logging.SystemLog;
 
-import javax.enterprise.deploy.spi.DeploymentManager;
-import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderResponse;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @version $Rev$ $Date$
  */
@@ -382,6 +384,16 @@
         return null;
     }
 
+    public static J2EEDeployedObject getModule(PortletRequest request, Artifact configuration) {
+        ManagementHelper helper = getManagementHelper(request);
+        return helper.getModuleForConfiguration(configuration);        
+    }
+
+    public static ConfigurationInfo[] getConfigurations(PortletRequest request, ConfigurationModuleType type, boolean includeChildModules) {
+        ManagementHelper helper = getManagementHelper(request);
+        return helper.getConfigurations(type, includeChildModules);
+    }
+
     /**
      * Looks up the context prefix used by the portal, even if the thing running
      * is in one of the portlets.  We're kind of hacking our way there, but hey,
@@ -394,6 +406,9 @@
             RenderResponse renderResponse = (RenderResponse) o;
             contextPath = renderResponse.createRenderURL().toString();
             int index = contextPath.indexOf(request.getPathInfo());
+            if(index == -1) { // todo: Hack!  But this doesn't always work otherwise if invoked from a page that was invoked from another portlet instead of a page accessed by top-level navigation
+                index = contextPath.indexOf(request.getPathInfo().substring(0, 20));
+            }
             contextPath = contextPath.substring(0, index);
         } else { // request did not come from a portlet
             contextPath = request.getContextPath();

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/portlet.xml?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/portlet.xml Tue Apr 11 22:21:19 2006
@@ -576,6 +576,52 @@
     </portlet>
 
     <portlet>
+        <description>Portlet for configuring Geronimo with Apache via mod_jk</description>
+        <portlet-name>ApacheJK</portlet-name>
+        <display-name>Apache mod_jk Wizard</display-name>
+
+        <portlet-class>org.apache.geronimo.console.apache.jk.ApacheConfigPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Apache mod_jk Configuration</title>
+            <short-title>Apache mod_jk</short-title>
+            <keywords>Apache http mod_jk jk ajp</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>New Portlet for configuring Keystores</description>
+        <portlet-name>Keystores</portlet-name>
+        <display-name>Keystore Wizard</display-name>
+
+        <portlet-class>org.apache.geronimo.console.keystores.KeystoresPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Keystore Configuration</title>
+            <short-title>Keystores</short-title>
+            <keywords>Keystore Keytool SSL</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
         <description>Portlet for managing JMS connections</description>
         <portlet-name>JMSConnections</portlet-name>
         <display-name>JMS Connection Factory Portlet</display-name>

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/web.xml?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/web.xml Tue Apr 11 22:21:19 2006
@@ -193,7 +193,20 @@
         </init-param>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for Keystore Portlet</display-name>
+        <display-name>Pluto Wrapper for Apache mod_jk Portlet</display-name>
+        <servlet-name>ApacheJK</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-class</param-name>
+            <param-value>org.apache.geronimo.console.apache.jk.ApacheConfigPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.ApacheJK</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for Old Keystore Portlet</display-name>
         <servlet-name>Keystore</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -218,6 +231,19 @@
             <param-value>console-standard.ThreadPool</param-value>
         </init-param>
     </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for New Keystore Portlet</display-name>
+        <servlet-name>Keystores</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-class</param-name>
+            <param-value>org.apache.geronimo.console.keystores.KeystoresPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.Keystores</param-value>
+        </init-param>
+    </servlet>
 
 
     <servlet>
@@ -774,12 +800,20 @@
         <url-pattern>/SecurityRealms/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
+        <servlet-name>ApacheJK</servlet-name>
+        <url-pattern>/ApacheJK/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
         <servlet-name>Keystore</servlet-name>
         <url-pattern>/Keystore/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>ThreadPool</servlet-name>
         <url-pattern>/ThreadPool/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>Keystores</servlet-name>
+        <url-pattern>/Keystores/*</url-pattern>
     </servlet-mapping>
 
 

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml Tue Apr 11 22:21:19 2006
@@ -56,7 +56,7 @@
         </gbean>
     </configuration>
     <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/directory/${pom.currentVersion}/car">
+    <configuration name="geronimo/directory/${pom.currentVersion}/car" load="false">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanLdapPort}</attribute>

Modified: geronimo/branches/1.1/configs/j2ee-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-security/project.xml?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-security/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-security/project.xml Tue Apr 11 22:21:19 2006
@@ -79,6 +79,14 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-util</artifactId>
+            <version>${geronimo_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${geronimo_version}</version>
         </dependency>

Modified: geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml Tue Apr 11 22:21:19 2006
@@ -26,8 +26,6 @@
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
 
     >
-
-
     <!--runtime dependencies-->
 
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
@@ -100,4 +98,13 @@
         <reference name="LoginService"><name>JaasLoginService</name></reference>
     </gbean>
 
+    <gbean name="KeystoreManager" class="org.apache.geronimo.security.keystore.FileKeystoreManager">
+        <attribute name="keystoreDir">var/security/keystores</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <references name="KeystoreInstances">
+          <pattern>
+            <type>Keystore</type>
+          </pattern>
+        </references>
+    </gbean>
 </configuration>

Modified: geronimo/branches/1.1/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/project.xml?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/project.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/project.xml Tue Apr 11 22:21:19 2006
@@ -134,6 +134,14 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-util</artifactId>
+            <version>${geronimo_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-webservices</artifactId>
             <version>${geronimo_version}</version>
             <properties>

Modified: geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Tue Apr 11 22:21:19 2006
@@ -620,6 +620,10 @@
             return null;
         }
 
+        public AbstractName getAbstractName() {
+            return null;
+        }
+
         public List listConfigurations() {
             return null;
         }

Modified: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java (original)
+++ geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java Tue Apr 11 22:21:19 2006
@@ -33,6 +33,7 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
 import org.apache.geronimo.system.repository.Maven1Repository;
+import org.apache.geronimo.gbean.AbstractName;
 
 /**
  * @version $Rev$ $Date$
@@ -84,6 +85,10 @@
             }
 
             public String getObjectName() {
+                return null;
+            }
+
+            public AbstractName getAbstractName() {
                 return null;
             }
 

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Tue Apr 11 22:21:19 2006
@@ -542,6 +542,10 @@
             return null;
         }
 
+        public AbstractName getAbstractName() {
+            return null;
+        }
+
         public List listConfigurations() {
             return null;
         }

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=393387&r1=393386&r2=393387&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 Tue Apr 11 22:21:19 2006
@@ -108,4 +108,5 @@
     public static final String CORBA_TSS = "CORBATSS";
     public static final String WEB_SERVICE_LINK = "WSLink";
     public static final String KEY_GENERATOR = "KeyGenerator";
+    public static final String KEYSTORE_INSTANCE = "Keystore";
 }

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=393387&r1=393386&r2=393387&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 Tue Apr 11 22:21:19 2006
@@ -41,6 +41,7 @@
 import org.apache.geronimo.management.geronimo.SecurityRealm;
 import org.apache.geronimo.management.geronimo.ThreadPool;
 import org.apache.geronimo.management.geronimo.WebManager;
+import org.apache.geronimo.management.geronimo.KeystoreManager;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 
 /**
@@ -165,6 +166,10 @@
 
     public LoginService getLoginService() {
         return (LoginService) getObject(LoginService.class);
+    }
+
+    public KeystoreManager getKeystoreManager() {
+        return (KeystoreManager) getObject(KeystoreManager.class);
     }
 
     public String getServerVendor() {

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=393387&r1=393386&r2=393387&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 Tue Apr 11 22:21:19 2006
@@ -17,22 +17,21 @@
 
 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.lang.reflect.Array;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.lang.reflect.Array;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.proxy.ProxyManager;
 
 /**
  * @version $Rev$ $Date$
  */
 public class Util {
 
-    public static String[] getObjectNames(Kernel kernel, Object parentName, String[] j2eeTypes) {
+    public static String[] getObjectNames(Kernel kernel, String parentName, String[] j2eeTypes) {
         List objectNames = new LinkedList();
         for (int i = 0; i < j2eeTypes.length; i++) {
             String j2eeType = j2eeTypes[i];
@@ -52,7 +51,7 @@
     }
 
 
-    public static Object[] getObjects(Kernel kernel, Object parentName, String[] j2eeTypes, Class target) {
+    public static Object[] getObjects(Kernel kernel, String parentName, String[] j2eeTypes, Class target) {
         List objectNames = new LinkedList();
         for (int i = 0; i < j2eeTypes.length; i++) {
             String j2eeType = j2eeTypes[i];

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Tue Apr 11 22:21:19 2006
@@ -326,6 +326,10 @@
             return null;
         }
 
+        public AbstractName getAbstractName() {
+            return null;
+        }
+
         public List listConfigurations() {
             return null;
         }

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java?rev=393387&r1=393386&r2=393387&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java Tue Apr 11 22:21:19 2006
@@ -183,6 +183,11 @@
     List children = new ArrayList();
 
     /**
+     * The parent of this configuration;
+     */
+    private Configuration parent = null;
+
+    /**
      * Only used to allow declaration as a reference.
      */
     public Configuration() {
@@ -279,6 +284,7 @@
             String moduleName = (String) entry.getKey();
             ConfigurationData childConfigurationData = (ConfigurationData) entry.getValue();
             Configuration childConfiguration = new Configuration(childParents, childConfigurationData, configurationResolver.createChildResolver(moduleName));
+            childConfiguration.parent = this;
             children.add(childConfiguration);
         }
     }
@@ -472,6 +478,14 @@
      */
     public synchronized boolean containsGBean(AbstractName gbean) {
         return gbeans.containsKey(gbean);
+    }
+
+    /**
+     * Gets the enclosing configuration of this one (e.g. the EAR for a WAR),
+     * or null if it has none.
+     */
+    public Configuration getEnclosingConfiguration() {
+        return parent;
     }
 
     public synchronized AbstractName addGBean(String name, GBeanData gbean) throws GBeanAlreadyExistsException {



Mime
View raw message