geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r388996 [2/2] - in /geronimo/branches/1.1: applications/console-core/src/java/org/apache/geronimo/console/core/security/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/src/var/config/ configs/activemq-broker/src/...
Date Mon, 27 Mar 2006 00:52:50 GMT
Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
(original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
Sun Mar 26 16:52:46 2006
@@ -41,7 +41,7 @@
     public final static String SERVERINFO_LM_OPTION = "org.apache.geronimo.security.realm.GenericSecurityRealm.SERVERINFO";
     public final static String CLASSLOADER_LM_OPTION = "org.apache.geronimo.security.realm.GenericSecurityRealm.CLASSLOADER";
 
-    private final LoginModuleGBean loginModule;
+    private final LoginModuleSettings loginModule;
     private final JaasLoginModuleUse next;
     private LoginModuleControlFlag controlFlag;
     private final Kernel kernel;
@@ -54,7 +54,7 @@
         kernel = null;
     }
 
-    public JaasLoginModuleUse(LoginModuleGBean loginModule, JaasLoginModuleUse next, String
controlFlag, Kernel kernel) {
+    public JaasLoginModuleUse(LoginModuleSettings loginModule, JaasLoginModuleUse next, String
controlFlag, Kernel kernel) {
         this.loginModule = loginModule;
         this.next = next;
         LoginModuleControlFlagEditor editor = new LoginModuleControlFlagEditor();
@@ -63,7 +63,7 @@
         this.kernel = kernel;
     }
 
-    public LoginModuleGBean getLoginModule() {
+    public LoginModuleSettings getLoginModule() {
         return loginModule;
     }
 
@@ -133,7 +133,7 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(JaasLoginModuleUse.class,
"LoginModuleUse");
         infoBuilder.addAttribute("controlFlag", String.class, true);
         infoBuilder.addAttribute("kernel", Kernel.class, false, false);
-        infoBuilder.addReference("LoginModule", LoginModuleGBean.class, NameFactory.LOGIN_MODULE);
+        infoBuilder.addReference("LoginModule", LoginModuleSettings.class, NameFactory.LOGIN_MODULE);
         infoBuilder.addReference("Next", JaasLoginModuleUse.class);
 
         infoBuilder.addOperation("configure", new Class[]{Set.class, List.class, Kernel.class,
ServerInfo.class, ClassLoader.class});

Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleSettings.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleSettings.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleSettings.java
(original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleSettings.java
Sun Mar 26 16:52:46 2006
@@ -22,23 +22,25 @@
  * @version $Rev$ $Date$
  */
 public interface LoginModuleSettings {
-    public String getLoginDomainName();
+    String getLoginDomainName();
 
-    public void setLoginDomainName(String loginDomainName);
+    void setLoginDomainName(String loginDomainName);
 
-    public Properties getOptions();
+    Properties getOptions();
 
-    public void setOptions(Properties options);
+    void setOptions(Properties options);
 
-    public String getLoginModuleClass();
+    String getLoginModuleClass();
 
-    public void setLoginModuleClass(String loginModuleClass);
+    void setLoginModuleClass(String loginModuleClass);
 
-    public boolean isServerSide();
+    boolean isServerSide();
 
-    public void setServerSide(boolean serverSide);
+    void setServerSide(boolean serverSide);
 
-    public boolean isWrapPrincipals();
+    boolean isWrapPrincipals();
 
-    public void setWrapPrincipals(boolean wrapPrincipals);
+    void setWrapPrincipals(boolean wrapPrincipals);
+
+    ClassLoader getClassLoader();
 }

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Sun Mar 26 16:52:46 2006
@@ -16,33 +16,31 @@
  */
 package org.apache.geronimo.system.configuration;
 
+import java.beans.PropertyEditor;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.geronimo.common.propertyeditor.PropertyEditors;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.ReferencePatterns;
-import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.util.EncryptionManager;
 import org.apache.geronimo.kernel.InvalidGBeanException;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.util.EncryptionManager;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import java.beans.PropertyEditor;
-import java.io.PrintWriter;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashMap;
-import java.util.List;
-
 /**
  * @version $Rev$ $Date$
  */
@@ -90,10 +88,10 @@
         references.putAll(gbeanData.getReferences());
     }
 
-    public GBeanOverride(Element gbean) throws MalformedObjectNameException, InvalidGBeanException
{
+    public GBeanOverride(Element gbean) throws InvalidGBeanException {
         String nameString = gbean.getAttribute("name");
-        if (nameString.indexOf(':') > -1) {
-            name = ObjectName.getInstance(nameString);
+        if (nameString.indexOf('?') > -1) {
+            name = new AbstractName(URI.create(nameString));
         } else {
             name = nameString;
         }
@@ -104,8 +102,8 @@
         } else {
             gbeanInfo = null;
         }
-        if (gbeanInfo != null && !(name instanceof ObjectName)) {
-            throw new MalformedObjectNameException("A gbean element using the gbeanInfo attribute
must be specified using a full ObjectName: name=" + nameString);
+        if (gbeanInfo != null && !(name instanceof AbstractName)) {
+            throw new InvalidGBeanException("A gbean element using the gbeanInfo attribute
must be specified using a full AbstractName: name=" + nameString);
         }
 
         String loadString = gbean.getAttribute("load");
@@ -230,7 +228,7 @@
         if (name instanceof String) {
             gbeanName = (String) name;
         } else {
-            gbeanName = ((ObjectName) name).getCanonicalName();
+            gbeanName = name.toString();
         }
 
         out.print("    <gbean name=\"" + gbeanName + "\"");

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/WebAppUtil.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/WebAppUtil.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/WebAppUtil.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/WebAppUtil.java
Sun Mar 26 16:52:46 2006
@@ -18,6 +18,8 @@
 
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.gbean.GBeanQuery;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 
 import javax.management.ObjectName;
 import java.util.Map;
@@ -43,16 +45,16 @@
      */
     public static Map mapContainersToURLs(Kernel kernel) throws Exception {
         Map containers = new HashMap();
-        Set set = kernel.listGBeans(new GBeanQuery(null, "org.apache.geronimo.management.geronimo.WebManager"));
+        Set set = kernel.listGBeans(new AbstractNameQuery("org.apache.geronimo.management.geronimo.WebManager"));
         for (Iterator it = set.iterator(); it.hasNext();) {
-            ObjectName mgrName = (ObjectName) it.next();
-            String[] cntNames = (String[]) kernel.getAttribute(mgrName, "containers");
+            AbstractName mgrName = (AbstractName) it.next();
+            AbstractName[] cntNames = (AbstractName[]) kernel.getAttribute(mgrName, "containers");
             for (int i = 0; i < cntNames.length; i++) {
-                String cntName = cntNames[i];
-                String[] cncNames = (String[]) kernel.invoke(mgrName, "getConnectorsForContainer",
new Object[]{cntName}, new String[]{"java.lang.String"});
+                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++) {
-                    ObjectName cncName = ObjectName.getInstance(cncNames[j]);
+                    AbstractName cncName = cncNames[j];
                     String protocol = (String) kernel.getAttribute(cncName, "protocol");
                     String url = (String) kernel.getAttribute(cncName, "connectUrl");
                     map.put(protocol, url);

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Sun Mar 26 16:52:46 2006
@@ -290,7 +290,7 @@
         try {
             webModuleData.setReferencePattern("J2EEServer", moduleContext.getServerName());
             if (!module.isStandAlone()) {
-                webModuleData.setReferencePattern("J2EEApplication", moduleContext.getModuleName());
+                webModuleData.setReferencePattern("J2EEApplication", earContext.getModuleName());
             }
 
             webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());



Mime
View raw message