geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r106462 - in geronimo/trunk/modules: assembly/src/plan deployment/src/test-resources/etc 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/java/org/apache/geronimo/security/jaas
Date Wed, 24 Nov 2004 20:50:01 GMT
Author: djencks
Date: Wed Nov 24 12:50:00 2004
New Revision: 106462

URL: http://svn.apache.org/viewcvs?view=rev&rev=106462
Log:
Move SecurityService -> SecurityServiceImpl
Added:
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
      - copied, changed from r106327, geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java
Removed:
   geronimo/trunk/modules/deployment/src/test-resources/etc/bootstrapped-service.xml
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java
Modified:
   geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
   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/BaseSecurityTest.java
   geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?view=diff&rev=106462&p1=geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r1=106461&p2=geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r2=106462
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml	Wed Nov 24 12:50:00 2004
@@ -135,7 +135,7 @@
         </references>
     </gbean>
 
-    <gbean name="geronimo.security:type=SecurityService" class="org.apache.geronimo.security.SecurityService">
+    <gbean name="geronimo.security:type=SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
         <attribute name="policyConfigurationFactory" type="java.lang.String">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
         <reference name="Realms">geronimo.security:type=SecurityRealm,*</reference>
     </gbean>

Deleted: /geronimo/trunk/modules/deployment/src/test-resources/etc/bootstrapped-service.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/test-resources/etc/bootstrapped-service.xml?view=auto&rev=106461
==============================================================================

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=106462&p1=geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r1=106461&p2=geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r2=106462
==============================================================================
--- 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 12:50:00 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.SecurityService;
+import org.apache.geronimo.security.SecurityServiceImpl;
 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 SecurityService securityService;
+    private final SecurityServiceImpl securityService;
 
-    public JettyModuleBuilder(URI defaultParentId, SecurityService securityService) {
+    public JettyModuleBuilder(URI defaultParentId, SecurityServiceImpl 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", SecurityService.class);
+        infoBuilder.addReference("SecurityService", SecurityServiceImpl.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=106462&p1=geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java&r1=106461&p2=geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java&r2=106462
==============================================================================
--- 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 12:50:00 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.SecurityService;
+import org.apache.geronimo.security.SecurityServiceImpl;
 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 SecurityService securityService;
+    private final SecurityServiceImpl securityService;
     private final JAASJettyPrincipal defaultPrincipal;
 
     private PolicyConfigurationFactory factory;
@@ -119,7 +119,7 @@
             Set applicationManagedSecurityResources,
             String policyContextID,
             Security securityConfig,
-            SecurityService securityService,
+            SecurityServiceImpl securityService,
             TransactionContextManager transactionContextManager,
             TrackedConnectionAssociator trackedConnectionAssociator,
             JettyContainer jettyContainer) throws MalformedURLException {
@@ -161,7 +161,7 @@
         return securityConfig;
     }
 
-    public SecurityService getSecurityService() {
+    public SecurityServiceImpl 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", SecurityService.class);
+        infoFactory.addReference("SecurityService", SecurityServiceImpl.class);
 
         infoFactory.setConstructor(new String[]{
             "kernel",

Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/BaseSecurityTest.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/BaseSecurityTest.java?view=diff&rev=106462&p1=geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/BaseSecurityTest.java&r1=106461&p2=geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/BaseSecurityTest.java&r2=106462
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/BaseSecurityTest.java
(original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/BaseSecurityTest.java
Wed Nov 24 12:50:00 2004
@@ -107,8 +107,8 @@
         jaasRealmGBean.setAttribute("name", "Test JAAS Realm");
         jaasRealmGBean.setAttribute("loginModuleName", "jaasTest");
 
-        securityServiceGBean = new GBeanMBean("org.apache.geronimo.security.SecurityService");
-        securityServiceName = new ObjectName("geronimo.security:type=SecurityService");
+        securityServiceGBean = new GBeanMBean("org.apache.geronimo.security.SecurityServiceImpl");
+        securityServiceName = new ObjectName("geronimo.security:type=SecurityServiceImpl");
         securityServiceGBean.setReferencePatterns("Realms", Collections.singleton(new ObjectName("geronimo.security:type=SecurityRealm,*")));
         securityServiceGBean.setReferencePatterns("Mappers", Collections.singleton(new ObjectName("geronimo.security:type=SecurityRealm,*")));
         securityServiceGBean.setAttribute("policyConfigurationFactory", "org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory");

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=106462&p1=geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java&r1=106461&p2=geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java&r2=106462
==============================================================================
--- 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 12:50:00 2004
@@ -25,7 +25,7 @@
 import java.net.URL;
 
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
-import org.apache.geronimo.security.SecurityService;
+import org.apache.geronimo.security.SecurityServiceImpl;
 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");
 
-        SecurityService securityService = null;
+        SecurityServiceImpl securityService = null;
         try {
-            securityService = (SecurityService) kernel.getProxyManager().createProxy(securityServiceName,
SecurityService.class);
+            securityService = (SecurityServiceImpl) kernel.getProxyManager().createProxy(securityServiceName,
SecurityServiceImpl.class);
             securityConfig.autoGenerate(securityService);
 
             startWebApp(securityConfig);
@@ -247,9 +247,9 @@
         securityConfig.getRoleNames().add("content-administrator");
         securityConfig.getRoleNames().add("auto-administrator");
 
-        SecurityService securityService = null;
+        SecurityServiceImpl securityService = null;
         try {
-            securityService = (SecurityService) kernel.getProxyManager().createProxy(securityServiceName,
SecurityService.class);
+            securityService = (SecurityServiceImpl) kernel.getProxyManager().createProxy(securityServiceName,
SecurityServiceImpl.class);
             securityConfig.autoGenerate(securityService);
 
             DefaultPrincipal defaultPrincipal = new DefaultPrincipal();

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

Copied: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
(from r106327, geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java?view=diff&rev=106462&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java&r1=106327&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java&r2=106462
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java
(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
Wed Nov 24 12:50:00 2004
@@ -48,11 +48,11 @@
  *
  * @version $Rev$ $Date$
  */
-public class SecurityService implements SecurityServiceMBean, GBeanLifecycle {
+public class SecurityServiceImpl implements SecurityServiceMBean, GBeanLifecycle {
     /**
-     * The JMX name of the SecurityService.
+     * The JMX name of the SecurityServiceImpl.
      */
-    public static final ObjectName SECURITY = JMXUtil.getObjectName("geronimo.security:type=SecurityService");
+    public static final ObjectName SECURITY = JMXUtil.getObjectName("geronimo.security:type=SecurityServiceImpl");
 
     private final Log log = LogFactory.getLog(SecurityServiceMBean.class);
 
@@ -68,12 +68,12 @@
     public static final GeronimoSecurityPermission CONFIGURE = new GeronimoSecurityPermission("configure");
 
     //deprecated, for geronimo mbean only
-    public SecurityService() {
+    public SecurityServiceImpl() {
         this(null);
     }
 
 
-    public SecurityService(String policyConfigurationFactory) {
+    public SecurityServiceImpl(String policyConfigurationFactory) {
         /**
          *  @see "JSR 115 4.6.1" Container Subject Policy Contact Handler
          */
@@ -178,7 +178,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SecurityService.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SecurityServiceImpl.class);
 
         infoFactory.addAttribute("policyConfigurationFactory", String.class, true);
 

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=106462&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java&r1=106461&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Security.java&r2=106462
==============================================================================
--- 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 12:50:00 2004
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.geronimo.security.SecurityService;
+import org.apache.geronimo.security.SecurityServiceImpl;
 
 
 /**
@@ -108,7 +108,7 @@
      *
      * @param securityService used to obtain the configured auto map assistant.
      */
-    public void autoGenerate(SecurityService securityService) {
+    public void autoGenerate(SecurityServiceImpl securityService) {
         if (securityService == null) return;
         if (assistant == null) return;
 

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java?view=diff&rev=106462&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java&r1=106461&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java&r2=106462
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
Wed Nov 24 12:50:00 2004
@@ -35,7 +35,7 @@
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;
 import org.apache.geronimo.gbean.WaitingException;
-import org.apache.geronimo.security.SecurityService;
+import org.apache.geronimo.security.SecurityServiceImpl;
 
 
 /**
@@ -57,14 +57,14 @@
 
     public Collection getConfigurations() {
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null) sm.checkPermission(SecurityService.CONFIGURE);
+        if (sm != null) sm.checkPermission(SecurityServiceImpl.CONFIGURE);
 
         return configurations;
     }
 
     public void setConfigurations(Collection configurations) {
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null) sm.checkPermission(SecurityService.CONFIGURE);
+        if (sm != null) sm.checkPermission(SecurityServiceImpl.CONFIGURE);
 
         ReferenceCollection ref = (ReferenceCollection) configurations;
         ref.addReferenceCollectionListener(this);
@@ -89,7 +89,7 @@
 
     public void memberAdded(ReferenceCollectionEvent event) {
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null) sm.checkPermission(SecurityService.CONFIGURE);
+        if (sm != null) sm.checkPermission(SecurityServiceImpl.CONFIGURE);
 
         ConfigurationEntryFactory factory = (ConfigurationEntryFactory) event.getMember();
         addConfiguration(factory);
@@ -97,7 +97,7 @@
 
     public void memberRemoved(ReferenceCollectionEvent event) {
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null) sm.checkPermission(SecurityService.CONFIGURE);
+        if (sm != null) sm.checkPermission(SecurityServiceImpl.CONFIGURE);
 
         ConfigurationEntryFactory factory = (ConfigurationEntryFactory) event.getMember();
 

Mime
View raw message