ate 2004/11/07 19:23:37 Modified: components/security project.xml components/security/src/test/org/apache/jetspeed/security/spi TestRoleSecurityHandler.java TestCredentialHandler.java jetspeed-api/src/java/org/apache/jetspeed/security BasePrincipal.java UserManager.java SecurityException.java portal/src/test/org/apache/jetspeed/userinfo TestUserInfoManager.java components/security/src/java/org/apache/jetspeed/security/om/impl InternalPrincipalImpl.java InternalCredentialImpl.java components/security/src/java/org/apache/jetspeed/security/spi/impl LdapCredentialHandler.java DefaultPasswordCredentialImpl.java DefaultUserSecurityHandler.java SecurityAccessImpl.java DefaultCredentialHandler.java components/security/src/java/META-INF security.xml security_repository.xml components/security/src/java/org/apache/jetspeed/security/spi CredentialHandler.java SecurityAccess.java src/sql/mssql populate-userinfo-for-default-psml.sql applications/pam/src/java/org/apache/jetspeed/portlets/security/resources SecurityResources.properties SecurityResources_en.properties components/security/src/test/org/apache/jetspeed/security TestAuthenticationProviderProxy.java jetspeed-api/src/java/org/apache/jetspeed/security/om InternalPrincipal.java InternalCredential.java components/security/src/java/org/apache/jetspeed/security/impl AuthenticationProviderProxyImpl.java UserManagerImpl.java BasePrincipalImpl.java src/sql/mysql populate-userinfo-for-default-psml.sql src/schema security-schema.xml applications/pam/src/java/org/apache/jetspeed/portlets/security UserDetailsPortlet.java src/sql/oracle populate-userinfo-for-default-psml.sql components/security/src/java/org/apache/jetspeed/security AuthenticationProviderProxy.java applications/pam/src/webapp/WEB-INF/view user-details.jsp portal/src/webapp/WEB-INF/assembly jetspeed-spring.xml portal/src/java/org/apache/jetspeed/util/descriptor WebApplicationDescriptor.java src/sql populate-userinfo-for-default-psml.sql Added: components/security/src/test/org/apache/jetspeed/security/spi TestInternalPasswordCredentialStateHandlingInterceptor.java TestDefaultInternalPasswordCredentialInterceptor.java TestPasswordCredentialProvider.java jetspeed-api/src/java/org/apache/jetspeed/security PasswordCredential.java components/security/src/java/org/apache/jetspeed/security/spi/impl MessageDigestCredentialPasswordEncoder.java DefaultPasswordCredentialProvider.java DefaultCredentialPasswordValidator.java SimpleCredentialPasswordValidator.java InternalPasswordCredentialStateHandlingInterceptor.java DefaultInternalPasswordCredentialInterceptor.java components/security/src/java/org/apache/jetspeed/security/spi InternalPasswordCredentialInterceptor.java CredentialPasswordValidator.java CredentialPasswordEncoder.java PasswordCredentialProvider.java components/security/src/test/META-INF sipcshi.xml defipci.xml spcpv.xml Removed: components/security/src/java/org/apache/jetspeed/security PasswordCredential.java Log: JS2-151 implementation part 1: item 1, 2, 4, 6 and 8 done, as well as added a a Password tab to the UserDetailsPortlet. Warning: SECURITY_CREDENTIAL and SECURITY_PRINCIPAL table definitions changed! Revision Changes Path 1.22 +7 -0 jakarta-jetspeed-2/components/security/project.xml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/project.xml.diff?r1=1.21&r2=1.22 1.7 +12 -6 jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestRoleSecurityHandler.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestRoleSecurityHandler.java.diff?r1=1.6&r2=1.7 1.5 +5 -10 jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestCredentialHandler.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestCredentialHandler.java.diff?r1=1.4&r2=1.5 1.1 jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialStateHandlingInterceptor.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialStateHandlingInterceptor.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestDefaultInternalPasswordCredentialInterceptor.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestDefaultInternalPasswordCredentialInterceptor.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestPasswordCredentialProvider.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/TestPasswordCredentialProvider.java?rev=1.1 1.3 +11 -0 jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/BasePrincipal.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/BasePrincipal.java.diff?r1=1.2&r2=1.3 1.5 +22 -0 jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/UserManager.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/UserManager.java.diff?r1=1.4&r2=1.5 1.5 +1 -1 jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/SecurityException.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/SecurityException.java.diff?r1=1.4&r2=1.5 1.1 jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/PasswordCredential.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/PasswordCredential.java?rev=1.1 1.18 +1 -1 jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java.diff?r1=1.17&r2=1.18 1.3 +18 -0 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalPrincipalImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalPrincipalImpl.java.diff?r1=1.2&r2=1.3 1.2 +139 -4 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalCredentialImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalCredentialImpl.java.diff?r1=1.1&r2=1.2 1.3 +23 -18 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapCredentialHandler.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapCredentialHandler.java.diff?r1=1.2&r2=1.3 1.2 +70 -1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultPasswordCredentialImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultPasswordCredentialImpl.java.diff?r1=1.1&r2=1.2 1.5 +14 -14 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java.diff?r1=1.4&r2=1.5 1.2 +19 -0 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/SecurityAccessImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/SecurityAccessImpl.java.diff?r1=1.1&r2=1.2 1.9 +213 -139 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultCredentialHandler.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultCredentialHandler.java.diff?r1=1.8&r2=1.9 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/MessageDigestCredentialPasswordEncoder.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/MessageDigestCredentialPasswordEncoder.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultPasswordCredentialProvider.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultPasswordCredentialProvider.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultCredentialPasswordValidator.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultCredentialPasswordValidator.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/SimpleCredentialPasswordValidator.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/SimpleCredentialPasswordValidator.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/InternalPasswordCredentialStateHandlingInterceptor.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/InternalPasswordCredentialStateHandlingInterceptor.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultInternalPasswordCredentialInterceptor.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultInternalPasswordCredentialInterceptor.java?rev=1.1 1.2 +14 -1 jakarta-jetspeed-2/components/security/src/java/META-INF/security.xml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/META-INF/security.xml.diff?r1=1.1&r2=1.2 1.2 +80 -3 jakarta-jetspeed-2/components/security/src/java/META-INF/security_repository.xml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/META-INF/security_repository.xml.diff?r1=1.1&r2=1.2 1.3 +33 -23 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/CredentialHandler.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/CredentialHandler.java.diff?r1=1.2&r2=1.3 1.2 +11 -1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/SecurityAccess.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/SecurityAccess.java.diff?r1=1.1&r2=1.2 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/InternalPasswordCredentialInterceptor.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/InternalPasswordCredentialInterceptor.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/CredentialPasswordValidator.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/CredentialPasswordValidator.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/CredentialPasswordEncoder.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/CredentialPasswordEncoder.java?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/PasswordCredentialProvider.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/PasswordCredentialProvider.java?rev=1.1 1.4 +19 -19 jakarta-jetspeed-2/src/sql/mssql/populate-userinfo-for-default-psml.sql http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/src/sql/mssql/populate-userinfo-for-default-psml.sql.diff?r1=1.3&r2=1.4 1.8 +8 -1 jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources.properties http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources.properties.diff?r1=1.7&r2=1.8 1.8 +8 -1 jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_en.properties http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_en.properties.diff?r1=1.7&r2=1.8 1.3 +18 -15 jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestAuthenticationProviderProxy.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestAuthenticationProviderProxy.java.diff?r1=1.2&r2=1.3 1.3 +11 -0 jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/om/InternalPrincipal.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/om/InternalPrincipal.java.diff?r1=1.2&r2=1.3 1.2 +90 -2 jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/om/InternalCredential.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/security/om/InternalCredential.java.diff?r1=1.1&r2=1.2 1.4 +76 -54 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java.diff?r1=1.3&r2=1.4 1.16 +40 -45 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserManagerImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserManagerImpl.java.diff?r1=1.15&r2=1.16 1.4 +17 -0 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/BasePrincipalImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/BasePrincipalImpl.java.diff?r1=1.3&r2=1.4 1.7 +19 -19 jakarta-jetspeed-2/src/sql/mysql/populate-userinfo-for-default-psml.sql http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/src/sql/mysql/populate-userinfo-for-default-psml.sql.diff?r1=1.6&r2=1.7 1.6 +8 -0 jakarta-jetspeed-2/src/schema/security-schema.xml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/src/schema/security-schema.xml.diff?r1=1.5&r2=1.6 1.12 +84 -2 jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/UserDetailsPortlet.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/UserDetailsPortlet.java.diff?r1=1.11&r2=1.12 1.8 +19 -19 jakarta-jetspeed-2/src/sql/oracle/populate-userinfo-for-default-psml.sql http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/src/sql/oracle/populate-userinfo-for-default-psml.sql.diff?r1=1.7&r2=1.8 1.4 +28 -16 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java.diff?r1=1.3&r2=1.4 1.1 jakarta-jetspeed-2/components/security/src/test/META-INF/sipcshi.xml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/test/META-INF/sipcshi.xml?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/test/META-INF/defipci.xml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/test/META-INF/defipci.xml?rev=1.1 1.1 jakarta-jetspeed-2/components/security/src/test/META-INF/spcpv.xml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/src/test/META-INF/spcpv.xml?rev=1.1 1.10 +76 -0 jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-details.jsp http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-details.jsp.diff?r1=1.9&r2=1.10 1.31 +27 -3 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml.diff?r1=1.30&r2=1.31 1.3 +1 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java.diff?r1=1.2&r2=1.3 1.10 +19 -19 jakarta-jetspeed-2/src/sql/populate-userinfo-for-default-psml.sql http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/src/sql/populate-userinfo-for-default-psml.sql.diff?r1=1.9&r2=1.10
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]