Index: components/pom.xml =================================================================== --- components/pom.xml (revision 587804) +++ components/pom.xml (working copy) @@ -60,6 +60,7 @@ jetspeed-utils jetspeed-web-content jetspeed-webapp-logging + jetspeed-xbean-spring Index: components/jetspeed-xbean-spring/pom.xml =================================================================== --- components/jetspeed-xbean-spring/pom.xml (revision 0) +++ components/jetspeed-xbean-spring/pom.xml (revision 0) @@ -0,0 +1,74 @@ + + + org.apache.portals.jetspeed-2 + jetspeed-2 + 2.2-SNAPSHOT + + 4.0.0 + org.apache.directory.server + jetspeed-xbean-spring + Jetspeed Xbean Spring + + http://maven.apache.org + + + org.apache.portals.jetspeed-2 + jetspeed-portal + ${version} + sources + + + org.apache.portals.jetspeed-2 + jetspeed-security + ${version} + sources + + + + + + + org.apache.xbean + maven-xbean-plugin + + + + http://jetspeed2.apache.org/config/1.0 + target/xbean/${pom.artifactId}.xsd + + + mapping + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + + attach-artifact + + + + + ${basedir}/target/xbean/${pom.artifactId}.xsd + xsd + + + ${basedir}/target/xbean/${pom.artifactId}.xsd.html + xsd.html + + + + + + + + + \ No newline at end of file Property changes on: components/jetspeed-xbean-spring/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Date Revision Name: svn:eol-style + native Index: components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/SpringComponentManager.java =================================================================== --- components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/SpringComponentManager.java (revision 587804) +++ components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/SpringComponentManager.java (working copy) @@ -30,10 +30,10 @@ import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.support.FileSystemXmlApplicationContext; +import org.apache.xbean.spring.context.FileSystemXmlApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.XmlWebApplicationContext; +import org.apache.xbean.spring.context.XmlWebApplicationContext; /** *

Index: components/jetspeed-cm/pom.xml =================================================================== --- components/jetspeed-cm/pom.xml (revision 587804) +++ components/jetspeed-cm/pom.xml (working copy) @@ -46,6 +46,11 @@ provided + org.apache.xbean + xbean-spring + 3.2 + + org.springframework spring Index: components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java =================================================================== --- components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java (revision 587804) +++ components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java (working copy) @@ -1,9 +1,9 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 @@ -71,6 +71,7 @@ * @author David Sean Taylor * @author Chris Schaefer * @version $Id: $ + * @org.apache.xbean.XBean */ public class PortalAdministrationImpl implements PortalAdministration @@ -120,6 +121,9 @@ this.adminUtil = new AdminUtil(); } + /** + * @org.apache.xbean.InitMethod + */ public void start() { this.config = (Configuration) Jetspeed.getComponentManager().getComponent("portal_configuration"); Index: components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAuthenticationConfigurationImpl.java =================================================================== --- components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAuthenticationConfigurationImpl.java (revision 587804) +++ components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAuthenticationConfigurationImpl.java (working copy) @@ -23,6 +23,7 @@ * * @author David Sean Taylor * @version $Id: $ + * @org.apache.xbean.XBean */ public class PortalAuthenticationConfigurationImpl implements PortalAuthenticationConfiguration { Index: components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java =================================================================== --- components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java (revision 587804) +++ components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java (working copy) @@ -33,6 +33,7 @@ * * @author David Sean Taylor * @version $Id: $ + * @org.apache.xbean.XBean */ public class SecurityAccessControllerImpl implements SecurityAccessController { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LoginModuleProxyImpl.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LoginModuleProxyImpl.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LoginModuleProxyImpl.java (working copy) @@ -22,6 +22,7 @@ /** * @see org.apache.jetspeed.security.LoginModuleProxy * @author David Le Strat + * @org.apache.xbean.XBean */ public class LoginModuleProxyImpl implements LoginModuleProxy { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityProviderImpl.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityProviderImpl.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityProviderImpl.java (working copy) @@ -24,7 +24,8 @@ /** * @author David Le Strat - * + * @org.apache.xbean.XBean + * */ public class SecurityProviderImpl implements SecurityProvider { @@ -53,7 +54,8 @@ * @param securityMappingHandler The security mapping handler. */ public SecurityProviderImpl(AuthenticationProviderProxy atnProviderProxy, - RoleSecurityHandler roleSecurityHandler, GroupSecurityHandler groupSecurityHandler, + RoleSecurityHandler roleSecurityHandler, + GroupSecurityHandler groupSecurityHandler, SecurityMappingHandler securityMappingHandler) { // The authentication provider proxy. Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java (working copy) @@ -56,6 +56,7 @@ * * @author David Le Strat * @author David Sean Taylor + * @org.apache.xbean.XBean */ public class GroupManagerImpl implements GroupManager { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthenticationProviderImpl.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthenticationProviderImpl.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthenticationProviderImpl.java (working copy) @@ -30,6 +30,7 @@ /** * @see org.apache.jetspeed.security.AuthenticationProvider * @author David Le Strat + * @org.apache.xbean.XBean */ public class AuthenticationProviderImpl implements AuthenticationProvider { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java (working copy) @@ -56,6 +56,7 @@ * * @author David Le Strat * @author David Sean Taylor + * @org.apache.xbean.XBean */ public class RoleManagerImpl implements RoleManager { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java (working copy) @@ -33,6 +33,7 @@ * @see org.apache.jetspeed.security.AuthenticationProviderProxy * * @author David Le Strat + * @org.apache.xbean.XBean */ public class AuthenticationProviderProxyImpl implements AuthenticationProviderProxy { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java (working copy) @@ -48,6 +48,7 @@ *

* * @author David Le Strat + * @org.apache.xbean.XBean */ public class RdbmsPolicy extends Policy { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java (working copy) @@ -49,6 +49,7 @@ * * @author David Le Strat * @version $Id$ + * @org.apache.xbean.XBean */ public class UserManagerImpl implements UserManager { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProviderImpl.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProviderImpl.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProviderImpl.java (working copy) @@ -32,6 +32,7 @@ *

* @author David Sean Taylor * @version $Id: $ + * @org.apache.xbean.XBean * */ public class ActiveAuthenticationIdentityProviderImpl implements ActiveAuthenticationIdentityProvider Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/LdapSecurityMappingHandler.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/LdapSecurityMappingHandler.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/LdapSecurityMappingHandler.java (working copy) @@ -45,6 +45,7 @@ * @see org.apache.jetspeed.security.spi.SecurityMappingHandler * @author Mike Long
* David Le Strat + * @org.apache.xbean.XBean */ public class LdapSecurityMappingHandler implements SecurityMappingHandler { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/LdapGroupSecurityHandler.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/LdapGroupSecurityHandler.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/LdapGroupSecurityHandler.java (working copy) @@ -36,6 +36,7 @@ * @see org.apache.jetspeed.security.spi.GroupSecurityHandler * @author Mike Long
David Le Strat + * @org.apache.xbean.XBean */ public class LdapGroupSecurityHandler implements GroupSecurityHandler { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultSecurityMappingHandler.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultSecurityMappingHandler.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultSecurityMappingHandler.java (working copy) @@ -39,6 +39,7 @@ /** * @see org.apache.jetspeed.security.spi.SecurityMappingHandler * @author David Le Strat + * @org.apache.xbean.XBean */ public class DefaultSecurityMappingHandler implements SecurityMappingHandler { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultGroupSecurityHandler.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultGroupSecurityHandler.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultGroupSecurityHandler.java (working copy) @@ -32,6 +32,7 @@ * @see org.apache.jetspeed.security.spi.GroupSecurityHandler * @author David Le Strat * @author David Sean Taylor + * @org.apache.xbean.XBean */ public class DefaultGroupSecurityHandler implements GroupSecurityHandler { Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/LdapRoleSecurityHandler.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/LdapRoleSecurityHandler.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/LdapRoleSecurityHandler.java (working copy) @@ -1,9 +1,9 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 @@ -32,6 +32,9 @@ import org.apache.jetspeed.security.spi.impl.ldap.LdapRoleDaoImpl; import org.apache.jetspeed.security.spi.impl.ldap.LdapPrincipalDao; +/** + * @org.apache.xbean.XBean + */ public class LdapRoleSecurityHandler implements RoleSecurityHandler { /** The logger. */ Index: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultRoleSecurityHandler.java =================================================================== --- components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultRoleSecurityHandler.java (revision 587804) +++ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultRoleSecurityHandler.java (working copy) @@ -32,6 +32,7 @@ * @see org.apache.jetspeed.security.spi.RoleSecurityHandler * @author David Le Strat * @author David Sean Taylor + * @org.apache.xbean.XBean */ public class DefaultRoleSecurityHandler implements RoleSecurityHandler { Index: pom.xml =================================================================== --- pom.xml (revision 587804) +++ pom.xml (working copy) @@ -1131,10 +1131,72 @@ true + + org.apache.maven.plugins + maven-source-plugin + 2.0.3 + + + + org.apache.xbean + maven-xbean-plugin + 3.2 + + + + http://jetspeed.apache.org/config/1.0 + target/xbean/${pom.artifactId}.xsd + + + mapping + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.0 + + + attach-artifacts + package + + attach-artifact + + + + + ${basedir}/target/xbean/${pom.artifactId}.xsd + xsd + + + ${basedir}/target/xbean/${pom.artifactId}.xsd.html + xsd.html + + + + + + + + true + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + Index: jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-providers.xml =================================================================== --- jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-providers.xml (revision 587804) +++ jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-providers.xml (working copy) @@ -16,31 +16,27 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - DefaultAuthenticator - The default authenticator - login.conf - - - + + DefaultAuthenticator + The default authenticator + login.conf + #org.apache.jetspeed.security.spi.CredentialHandler" + #org.apache.jetspeed.security.spi.UserSecurityHandler" + - - + + - - DefaultAuthenticator - + + DefaultAuthenticator + - - + + localhost @@ -28,7 +28,7 @@ - + /WEB-INF/templates/ @@ -43,6 +43,7 @@ false + + + #org.apache.jetspeed.security.UserManager + #org.apache.jetspeed.security.RoleManager + #org.apache.jetspeed.security.GroupManager + #org.apache.jetspeed.page.PageManager + #org.apache.jetspeed.prefs.PreferencesProvider + #org.apache.jetspeed.profiler.Profiler + #mailSender + #adminVelocityEngine + + + org.apache.jetspeed.administration.PortalAdministration @@ -84,59 +96,98 @@ PROPAGATION_REQUIRED,-org.apache.jetspeed.administration.RegistrationException - - - - - - - - - 2 - - - - - - - false - - - - 0 - - - - /login/logout - - - - - - - - - - - org.apache.jetspeed.login.username - org.apache.jetspeed.login.password - org.apache.jetspeed.login.destination - org.apache.jetspeed.login.retrycount - org.apache.jetspeed.login.errorcode - org.apache.jetspeed.login.check - org.apache.jetspeed.theme.override - - - + + + + + #org.apache.jetspeed.page.PageManager + + + + + + + + + + + + + + #activeAuthenticationCache + + + org.apache.jetspeed.login.username + org.apache.jetspeed.login.password + org.apache.jetspeed.login.destination + org.apache.jetspeed.login.retrycount + org.apache.jetspeed.login.errorcode + org.apache.jetspeed.login.check + org.apache.jetspeed.theme.override + + + + Index: jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-managers.xml =================================================================== --- jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-managers.xml (revision 587804) +++ jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-managers.xml (working copy) @@ -16,32 +16,25 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - - + + #org.apache.jetspeed.security.SecurityProvider + - - - + + #org.apache.jetspeed.security.SecurityProvider + - - - + + #org.apache.jetspeed.security.SecurityProvider + - + Index: jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atn.xml =================================================================== --- jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atn.xml (revision 587804) +++ jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atn.xml (working copy) @@ -16,17 +16,15 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - + - + #org.apache.jetspeed.security.UserManager" - portal-user - + portal-user + Index: jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atz.xml =================================================================== --- jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atz.xml (revision 587804) +++ jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atz.xml (working copy) @@ -16,13 +16,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - - + + #org.apache.jetspeed.security.PermissionManager +