geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r106522 - in geronimo/trunk/modules: jetty-builder/src/java/org/apache/geronimo/jetty/deployment jetty/src/java/org/apache/geronimo/jetty jetty/src/test/org/apache/geronimo/jetty security/src/java/org/apache/geronimo/security security/src/java/org/apache/geronimo/security/deploy security/src/test/org/apache/geronimo/security/bridge
Date Thu, 25 Nov 2004 00:28:57 GMT
Author: djencks
Date: Wed Nov 24 16:28:57 2004
New Revision: 106522

URL: http://svn.apache.org/viewcvs?view=rev&rev=106522
Log:
SecurityServiceMBean -> SecurityService, and use interface where possible.
Added:
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java
      - copied, changed from r106439, geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceMBean.java
Removed:
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceMBean.java
Modified:
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
   geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java
   geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/AbstractUserPasswordBridgeTest.java

Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?view=diff&rev=106522&p1=geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r1=106521&p2=geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r2=106522
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Wed Nov 24 16:28:57 2004
@@ -59,7 +59,7 @@
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.security.deploy.Security;
 import org.apache.geronimo.security.deployment.SecurityBuilder;
-import org.apache.geronimo.security.SecurityServiceImpl;
+import org.apache.geronimo.security.SecurityService;
 import org.apache.geronimo.transaction.OnlineUserTransaction;
 import org.apache.geronimo.xbeans.geronimo.jetty.JettyDependencyType;
 import org.apache.geronimo.xbeans.geronimo.jetty.JettyGbeanType;
@@ -80,9 +80,9 @@
  */
 public class JettyModuleBuilder implements ModuleBuilder {
     private final URI defaultParentId;
-    private final SecurityServiceImpl securityService;
+    private final SecurityService securityService;
 
-    public JettyModuleBuilder(URI defaultParentId, SecurityServiceImpl securityService) {
+    public JettyModuleBuilder(URI defaultParentId, SecurityService securityService) {
         this.defaultParentId = defaultParentId;
         this.securityService = securityService;
     }
@@ -471,7 +471,7 @@
     static {
         GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(JettyModuleBuilder.class);
         infoBuilder.addAttribute("defaultParentId", URI.class, true);
-        infoBuilder.addReference("SecurityService", SecurityServiceImpl.class);
+        infoBuilder.addReference("SecurityService", SecurityService.class);
         infoBuilder.addInterface(ModuleBuilder.class);
 
         infoBuilder.setConstructor(new String[] {"defaultParentId", "SecurityService"});

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java?view=diff&rev=106522&p1=geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java&r1=106521&p2=geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java&r2=106522
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
Wed Nov 24 16:28:57 2004
@@ -51,7 +51,7 @@
 import org.apache.geronimo.security.PrimaryRealmPrincipal;
 import org.apache.geronimo.security.RealmPrincipal;
 import org.apache.geronimo.security.SubjectId;
-import org.apache.geronimo.security.SecurityServiceImpl;
+import org.apache.geronimo.security.SecurityService;
 import org.apache.geronimo.security.realm.SecurityRealm;
 import org.apache.geronimo.security.deploy.DefaultPrincipal;
 import org.apache.geronimo.security.deploy.Security;
@@ -87,7 +87,7 @@
     private final Kernel kernel;
     private final String policyContextID;
     private final Security securityConfig;
-    private final SecurityServiceImpl securityService;
+    private final SecurityService securityService;
     private final JAASJettyPrincipal defaultPrincipal;
 
     private PolicyConfigurationFactory factory;
@@ -119,7 +119,7 @@
             Set applicationManagedSecurityResources,
             String policyContextID,
             Security securityConfig,
-            SecurityServiceImpl securityService,
+            SecurityService securityService,
             TransactionContextManager transactionContextManager,
             TrackedConnectionAssociator trackedConnectionAssociator,
             JettyContainer jettyContainer) throws MalformedURLException {
@@ -161,7 +161,7 @@
         return securityConfig;
     }
 
-    public SecurityServiceImpl getSecurityService() {
+    public SecurityService getSecurityService() {
         return securityService;
     }
 
@@ -548,7 +548,7 @@
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("policyContextID", String.class, true);
         infoFactory.addAttribute("securityConfig", Security.class, true);
-        infoFactory.addReference("SecurityService", SecurityServiceImpl.class);
+        infoFactory.addReference("SecurityService", SecurityService.class);
 
         infoFactory.setConstructor(new String[]{
             "kernel",

Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java?view=diff&rev=106522&p1=geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java&r1=106521&p2=geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java&r2=106522
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java	(original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java	Wed
Nov 24 16:28:57 2004
@@ -25,7 +25,7 @@
 import java.net.URL;
 
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
-import org.apache.geronimo.security.SecurityServiceImpl;
+import org.apache.geronimo.security.SecurityService;
 import org.apache.geronimo.security.deploy.AutoMapAssistant;
 import org.apache.geronimo.security.deploy.DefaultPrincipal;
 import org.apache.geronimo.security.deploy.Principal;
@@ -155,9 +155,9 @@
         securityConfig.getRoleNames().add("content-administrator");
         securityConfig.getRoleNames().add("auto-administrator");
 
-        SecurityServiceImpl securityService = null;
+        SecurityService securityService = null;
         try {
-            securityService = (SecurityServiceImpl) kernel.getProxyManager().createProxy(securityServiceName,
SecurityServiceImpl.class);
+            securityService = (SecurityService) kernel.getProxyManager().createProxy(securityServiceName,
SecurityService.class);
             securityConfig.autoGenerate(securityService);
 
             startWebApp(securityConfig);
@@ -247,9 +247,9 @@
         securityConfig.getRoleNames().add("content-administrator");
         securityConfig.getRoleNames().add("auto-administrator");
 
-        SecurityServiceImpl securityService = null;
+        SecurityService securityService = null;
         try {
-            securityService = (SecurityServiceImpl) kernel.getProxyManager().createProxy(securityServiceName,
SecurityServiceImpl.class);
+            securityService = (SecurityService) kernel.getProxyManager().createProxy(securityServiceName,
SecurityService.class);
             securityConfig.autoGenerate(securityService);
 
             DefaultPrincipal defaultPrincipal = new DefaultPrincipal();

Copied: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java
(from r106439, geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceMBean.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java?view=diff&rev=106522&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceMBean.java&r1=106439&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java&r2=106522
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceMBean.java
(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java
Wed Nov 24 16:28:57 2004
@@ -19,6 +19,7 @@
 
 import java.util.Collection;
 import org.apache.geronimo.common.GeronimoSecurityException;
+import org.apache.geronimo.security.realm.AutoMapAssistant;
 
 
 /**
@@ -26,7 +27,7 @@
  *
  * @version $Rev$ $Date$
  */
-public interface SecurityServiceMBean {
+public interface SecurityService {
 
     String getPolicyConfigurationFactory();
 
@@ -39,4 +40,6 @@
     Collection getModuleConfigurations();
 
     void setModuleConfigurations(Collection moduleConfigurations);
+
+    AutoMapAssistant getMapper(String name);
 }

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java?view=diff&rev=106522&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java&r1=106521&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java&r2=106522
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
Wed Nov 24 16:28:57 2004
@@ -48,13 +48,13 @@
  *
  * @version $Rev$ $Date$
  */
-public class SecurityServiceImpl implements SecurityServiceMBean, GBeanLifecycle {
+public class SecurityServiceImpl implements SecurityService, GBeanLifecycle {
     /**
      * The JMX name of the SecurityServiceImpl.
      */
     public static final ObjectName SECURITY = JMXUtil.getObjectName("geronimo.security:type=SecurityServiceImpl");
 
-    private final Log log = LogFactory.getLog(SecurityServiceMBean.class);
+    private final Log log = LogFactory.getLog(SecurityService.class);
 
     private String policyConfigurationFactory;
     private Collection realms = Collections.EMPTY_SET;

Deleted: /geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceMBean.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceMBean.java?view=auto&rev=106521
==============================================================================

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java?view=diff&rev=106522&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java&r1=106521&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java&r2=106522
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java
(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java
Wed Nov 24 16:28:57 2004
@@ -24,6 +24,7 @@
 import java.util.Set;
 
 import org.apache.geronimo.security.SecurityServiceImpl;
+import org.apache.geronimo.security.SecurityService;
 
 
 /**
@@ -108,7 +109,7 @@
      *
      * @param securityService used to obtain the configured auto map assistant.
      */
-    public void autoGenerate(SecurityServiceImpl securityService) {
+    public void autoGenerate(SecurityService securityService) {
         if (securityService == null) return;
         if (assistant == null) return;
 

Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/AbstractUserPasswordBridgeTest.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/AbstractUserPasswordBridgeTest.java?view=diff&rev=106522&p1=geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/AbstractUserPasswordBridgeTest.java&r1=106521&p2=geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/AbstractUserPasswordBridgeTest.java&r2=106522
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/AbstractUserPasswordBridgeTest.java
(original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/AbstractUserPasswordBridgeTest.java
Wed Nov 24 16:28:57 2004
@@ -20,7 +20,7 @@
 import javax.security.auth.Subject;
 
 import org.apache.geronimo.security.AbstractTest;
-import org.apache.geronimo.security.SecurityServiceMBean;
+import org.apache.geronimo.security.SecurityService;
 import org.apache.geronimo.security.realm.providers.GeronimoPasswordCredential;
 
 
@@ -28,7 +28,7 @@
  * @version $Rev$ $Date$
  */
 public abstract class AbstractUserPasswordBridgeTest extends AbstractTest {
-    private SecurityServiceMBean securityService;
+    private SecurityService securityService;
     protected final static String USER = "testuser";
     protected final static String PASSWORD = "testpassword";
 

Mime
View raw message