]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
CSPACE-1050 merged authz prototype from sanjay's sandbox to trunk. requires the follo...
authorSanjay Dalal <sanjay.dalal@berkeley.edu>
Wed, 24 Mar 2010 23:46:37 +0000 (23:46 +0000)
committerSanjay Dalal <sanjay.dalal@berkeley.edu>
Wed, 24 Mar 2010 23:46:37 +0000 (23:46 +0000)
commit34af95cf7a0330db4d234b156476cede0ef87c4b
tree502c9da6035c93a0a6d7565d8ca2fd01940f925e
parenta196a518faab4afdf99ddb59c44b091d917e9eba
CSPACE-1050 merged authz prototype from sanjay's sandbox to trunk. requires the following:
ant clean undeploy deploy at the trunk level
may require nuking org/collectionspace, org/jvnet, com/sun packages from local maven repository before building
ant create_db at the trunk level
test: mvn test at the trunk level

note: authorization is disabled at runtime as permissions database is not yet populated with permissions for the test user (role admin)

_M   trunk
A  + trunk/services/authentication/service/src/main/java/org/collectionspace/authentication/AuthN.java
A  + trunk/services/authentication/service/src/main/java/org/collectionspace/authentication/spring/SpringSecurityContextUtils.java
M    trunk/services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceUserDetailsService.java
M    trunk/services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceAuthorityGranter.java
M    trunk/services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceTenant.java
A  + trunk/services/authentication/service/src/main/java/org/collectionspace/authentication/SecurityContextUtils.java
_M   trunk/services/authentication/service/src/main/resources/config/web-security-config.xml
M    trunk/services/authentication/service/pom.xml
M    trunk/services/authentication/jaxb/src/test/resources/META-INF/persistence.xml
D    trunk/services/authentication/jaxb/src/test/resources/log4j.properties
M    trunk/services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd
M    trunk/services/authentication/pom.xml
M    trunk/services/authentication/pstore/src/test/resources/META-INF/persistence.xml
D    trunk/services/authentication/pstore/src/test/resources/log4j.properties
M    trunk/services/authentication/pstore/src/main/resources/db/mysql/authentication_index.sql
M    trunk/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql
M    trunk/services/authentication/pstore/src/main/resources/db/mysql/authentication.sql
M    trunk/services/authentication/pstore/pom.xml
_M   trunk/services/collectionobject/service/src
_M   trunk/services/collectionobject/service/pom.xml
_M   trunk/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
_M   trunk/services/JaxRsServiceProvider
M    trunk/services/JaxRsServiceProvider/nb-configuration.xml
MM   trunk/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
M    trunk/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
A  + trunk/services/JaxRsServiceProvider/src/main/resources/urls.properties
M    trunk/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml
M    trunk/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/applicationContext-security.xml
M    trunk/services/JaxRsServiceProvider/pom.xml
A  + trunk/services/common/lib/spring/aopalliance-1.0.jar
A  + trunk/services/common/lib/spring/org.springframework.transaction-3.0.0.RELEASE.jar
D    trunk/services/common/lib/spring/spring-security-core-3.0.1.RELEASE.jar
A  + trunk/services/common/lib/spring/spring-security-core-3.0.2.RELEASE.jar
D    trunk/services/common/lib/spring/spring-security-acl-3.0.1.RELEASE.jar
A  + trunk/services/common/lib/spring/spring-security-acl-3.0.2.RELEASE.jar
A  + trunk/services/common/lib/spring/ehcache-1.6.2.jar
A  + trunk/services/common/lib/spring/org.springframework.context.support-3.0.0.BUILD-20100208195804.jar
D    trunk/services/common/lib/spring/spring-security-config-3.0.1.RELEASE.jar
A  + trunk/services/common/lib/spring/spring-security-config-3.0.2.RELEASE.jar
D    trunk/services/common/lib/spring/spring-security-web-3.0.1.RELEASE.jar
A  + trunk/services/common/lib/spring/spring-security-web-3.0.2.RELEASE.jar
M    trunk/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java
A  + trunk/services/common/src/main/java/org/collectionspace/services/common/security/SecurityInterceptor.java
_M   trunk/services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java
_M   trunk/services/common/src/main/java/org/collectionspace/services/common/document/DocumentWrapper.java
_M   trunk/services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandlerImpl.java
_M   trunk/services/common/src/main/java/org/collectionspace/services/common/document/DocumentFilter.java
_M   trunk/services/common/src/main/java/org/collectionspace/services/common/document/DocumentNotFoundException.java
_M   trunk/services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java
_M   trunk/services/common/src/main/java/org/collectionspace/services/common/document/DocumentException.java
_M   trunk/services/common/src/main/java/org/collectionspace/services/common/document/BadRequestException.java
M    trunk/services/common/src/main/config/log/jboss-log4j-release.xml
M    trunk/services/common/src/main/config/log/jboss-log4j.xml
_M   trunk/services/common/src/main/resources/service-config.xsd
M    trunk/services/common/pom.xml
M    trunk/services/common/build.xml
M    trunk/services/pom.xml
_M   trunk/services/id
_M   trunk/services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java
_M   trunk/services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java
_M   trunk/services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java
_M   trunk/services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java
_M   trunk/services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java
_M   trunk/services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java
_M   trunk/services/id/service/src/main/java/org/collectionspace/services/id/AlphabeticIDGeneratorPart.java
_M   trunk/services/id/service/src/main/java/org/collectionspace/services/id/YearIDGeneratorPart.java
_M   trunk/services/id/service/src/main/java/org/collectionspace/services/id/NumericIDGeneratorPart.java
_M   trunk/services/id/service/src/main/java/org/collectionspace/services/id/StringIDGeneratorPart.java
_M   trunk/services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorPart.java
_M   trunk/services/id/service/src/main/java/org/collectionspace/services/id/BaseIDGenerator.java
M    trunk/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java
M    trunk/services/account/service/pom.xml
M    trunk/services/build.xml
A  + trunk/services/authorization
AM + trunk/services/authorization/service
A  + trunk/services/authorization/service/src
A  + trunk/services/authorization/service/src/test
A  + trunk/services/authorization/service/src/test/java
A  + trunk/services/authorization/service/src/test/java/org
A  + trunk/services/authorization/service/src/test/java/org/collectionspace
A  + trunk/services/authorization/service/src/test/java/org/collectionspace/services
A  + trunk/services/authorization/service/src/test/java/org/collectionspace/services/authorization
A  + trunk/services/authorization/service/src/test/java/org/collectionspace/services/authorization/test
A  + trunk/services/authorization/service/src/test/java/org/collectionspace/services/authorization/test/AuthorizationSeedTest.java
A  + trunk/services/authorization/service/src/test/resources
A  + trunk/services/authorization/service/src/test/resources/applicationContext-authorization-test.xml
A  + trunk/services/authorization/service/src/test/resources/test-data
A  + trunk/services/authorization/service/src/test/resources/test-data/test-permissions.xml
A  + trunk/services/authorization/service/src/test/resources/log4j.properties
A  + trunk/services/authorization/service/src/main
A  + trunk/services/authorization/service/src/main/java
A  + trunk/services/authorization/service/src/main/java/org
A  + trunk/services/authorization/service/src/main/java/org/collectionspace
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringPermissionManager.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/CSpaceSecurityMetadataSource.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringAuthorizationProvider.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringPermissionEvaluator.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/CSpaceResource.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/CSpaceResourceImpl.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/URIResourceImpl.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/AuthZ.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spi
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spi/CSpacePermissionManager.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spi/CSpaceAuthorizationProvider.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spi/CSpacePermissionEvaluator.java
A  + trunk/services/authorization/service/src/main/java/org/collectionspace/services/authorization/CSpaceAction.java
A  + trunk/services/authorization/service/src/main/resources
A  + trunk/services/authorization/service/src/main/resources/applicationContext-authorization.xml
A  + trunk/services/authorization/service/pom.xml
A  + trunk/services/authorization/service/build.xml
AM + trunk/services/authorization/jaxb
A  + trunk/services/authorization/jaxb/.classpath
A  + trunk/services/authorization/jaxb/.project
A  + trunk/services/authorization/jaxb/src
A  + trunk/services/authorization/jaxb/src/test
A  + trunk/services/authorization/jaxb/src/test/resources
A  + trunk/services/authorization/jaxb/src/test/resources/META-INF
A  + trunk/services/authorization/jaxb/src/test/resources/META-INF/persistence.xml
A  + trunk/services/authorization/jaxb/src/test/resources/log4j.properties
A  + trunk/services/authorization/jaxb/src/test/resources/hibernate.cfg.xml
A  + trunk/services/authorization/jaxb/src/main
A  + trunk/services/authorization/jaxb/src/main/resources
A  + trunk/services/authorization/jaxb/src/main/resources/authorization_provider.xsd
A  + trunk/services/authorization/jaxb/pom.xml
A  + trunk/services/authorization/jaxb/.settings
A  + trunk/services/authorization/jaxb/.settings/org.eclipse.jdt.core.prefs
A  + trunk/services/authorization/jaxb/.settings/org.maven.ide.eclipse.prefs
A  + trunk/services/authorization/pom.xml
AM + trunk/services/authorization/pstore
A  + trunk/services/authorization/pstore/.classpath
A  + trunk/services/authorization/pstore/.project
A  + trunk/services/authorization/pstore/src
A  + trunk/services/authorization/pstore/src/test
A  + trunk/services/authorization/pstore/src/test/resources
A  + trunk/services/authorization/pstore/src/test/resources/META-INF
A  + trunk/services/authorization/pstore/src/test/resources/META-INF/persistence.xml
A  + trunk/services/authorization/pstore/src/test/resources/hibernate.cfg.xml
A  + trunk/services/authorization/pstore/src/main
A  + trunk/services/authorization/pstore/src/main/resources
A  + trunk/services/authorization/pstore/src/main/resources/db
A  + trunk/services/authorization/pstore/src/main/resources/db/mysql
A  + trunk/services/authorization/pstore/src/main/resources/db/mysql/authorization_index.sql
A  + trunk/services/authorization/pstore/src/main/resources/db/mysql/acl.sql
A  + trunk/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql
A  + trunk/services/authorization/pstore/src/main/resources/db/mysql/authorization.sql
A  + trunk/services/authorization/pstore/pom.xml
A  + trunk/services/authorization/pstore/build.xml
A  + trunk/services/authorization/build.xml
M    trunk/services/client/src/test/java/org/collectionspace/services/client/test/ServiceLayerTest.java
_M   trunk/services/client/src/main/java/org/collectionspace/services/client/test/ServiceTest.java
_M   trunk/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java
_M   trunk/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
_M   trunk/src/site
_M   trunk/docs/allteam-061409-toronto
_M   trunk/docs/allteam-061409-toronto/Toronto_BehindTheScenes.pptx
_M   trunk/HelloWorld
_M   trunk/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd
_M   trunk/HelloWorld/HelloWorldNuxeoService
_M   trunk/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/HelloworldNuxeoApplication.java
81 files changed:
services/JaxRsServiceProvider/nb-configuration.xml
services/JaxRsServiceProvider/pom.xml
services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
services/JaxRsServiceProvider/src/main/resources/urls.properties [new file with mode: 0644]
services/JaxRsServiceProvider/src/main/webapp/WEB-INF/applicationContext-security.xml
services/JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml
services/account/service/pom.xml
services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java
services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd
services/authentication/jaxb/src/test/resources/META-INF/persistence.xml
services/authentication/pom.xml
services/authentication/pstore/pom.xml
services/authentication/pstore/src/main/resources/db/mysql/authentication.sql
services/authentication/pstore/src/main/resources/db/mysql/authentication_index.sql
services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql
services/authentication/pstore/src/test/resources/META-INF/persistence.xml
services/authentication/service/pom.xml
services/authentication/service/src/main/java/org/collectionspace/authentication/AuthN.java [new file with mode: 0644]
services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceTenant.java
services/authentication/service/src/main/java/org/collectionspace/authentication/SecurityContextUtils.java [new file with mode: 0644]
services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceAuthorityGranter.java
services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceUserDetailsService.java
services/authentication/service/src/main/java/org/collectionspace/authentication/spring/SpringSecurityContextUtils.java [new file with mode: 0644]
services/authorization/build.xml [new file with mode: 0644]
services/authorization/jaxb/.classpath [new file with mode: 0644]
services/authorization/jaxb/.project [new file with mode: 0644]
services/authorization/jaxb/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
services/authorization/jaxb/.settings/org.maven.ide.eclipse.prefs [new file with mode: 0644]
services/authorization/jaxb/pom.xml [new file with mode: 0644]
services/authorization/jaxb/src/main/resources/authorization_provider.xsd [new file with mode: 0644]
services/authorization/jaxb/src/test/resources/META-INF/persistence.xml [new file with mode: 0644]
services/authorization/jaxb/src/test/resources/hibernate.cfg.xml [new file with mode: 0644]
services/authorization/jaxb/src/test/resources/log4j.properties [moved from services/authentication/jaxb/src/test/resources/log4j.properties with 100% similarity]
services/authorization/pom.xml [new file with mode: 0644]
services/authorization/pstore/.classpath [new file with mode: 0644]
services/authorization/pstore/.project [new file with mode: 0644]
services/authorization/pstore/build.xml [new file with mode: 0644]
services/authorization/pstore/pom.xml [new file with mode: 0644]
services/authorization/pstore/src/main/resources/db/mysql/acl.sql [new file with mode: 0644]
services/authorization/pstore/src/main/resources/db/mysql/authorization.sql [new file with mode: 0644]
services/authorization/pstore/src/main/resources/db/mysql/authorization_index.sql [new file with mode: 0644]
services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql [new file with mode: 0644]
services/authorization/pstore/src/test/resources/META-INF/persistence.xml [new file with mode: 0644]
services/authorization/pstore/src/test/resources/hibernate.cfg.xml [new file with mode: 0644]
services/authorization/service/build.xml [new file with mode: 0644]
services/authorization/service/pom.xml [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/AuthZ.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/CSpaceAction.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/CSpaceResource.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/CSpaceResourceImpl.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/URIResourceImpl.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/spi/CSpaceAuthorizationProvider.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/spi/CSpacePermissionEvaluator.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/spi/CSpacePermissionManager.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/CSpaceSecurityMetadataSource.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringAuthorizationProvider.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringPermissionEvaluator.java [new file with mode: 0644]
services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringPermissionManager.java [new file with mode: 0644]
services/authorization/service/src/main/resources/applicationContext-authorization.xml [new file with mode: 0644]
services/authorization/service/src/test/java/org/collectionspace/services/authorization/test/AuthorizationSeedTest.java [new file with mode: 0644]
services/authorization/service/src/test/resources/applicationContext-authorization-test.xml [new file with mode: 0644]
services/authorization/service/src/test/resources/log4j.properties [moved from services/authentication/pstore/src/test/resources/log4j.properties with 92% similarity]
services/authorization/service/src/test/resources/test-data/test-permissions.xml [new file with mode: 0644]
services/build.xml
services/client/src/test/java/org/collectionspace/services/client/test/ServiceLayerTest.java
services/common/build.xml
services/common/lib/spring/aopalliance-1.0.jar [new file with mode: 0644]
services/common/lib/spring/ehcache-1.6.2.jar [new file with mode: 0644]
services/common/lib/spring/org.springframework.context.support-3.0.0.BUILD-20100208195804.jar [new file with mode: 0644]
services/common/lib/spring/org.springframework.transaction-3.0.0.RELEASE.jar [new file with mode: 0644]
services/common/lib/spring/spring-security-acl-3.0.2.RELEASE.jar [moved from services/common/lib/spring/spring-security-acl-3.0.1.RELEASE.jar with 80% similarity]
services/common/lib/spring/spring-security-config-3.0.2.RELEASE.jar [moved from services/common/lib/spring/spring-security-config-3.0.1.RELEASE.jar with 78% similarity]
services/common/lib/spring/spring-security-core-3.0.2.RELEASE.jar [moved from services/common/lib/spring/spring-security-core-3.0.1.RELEASE.jar with 77% similarity]
services/common/lib/spring/spring-security-web-3.0.2.RELEASE.jar [moved from services/common/lib/spring/spring-security-web-3.0.1.RELEASE.jar with 67% similarity]
services/common/pom.xml
services/common/src/main/config/log/jboss-log4j-release.xml
services/common/src/main/config/log/jboss-log4j.xml
services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java
services/common/src/main/java/org/collectionspace/services/common/security/SecurityInterceptor.java [new file with mode: 0644]
services/pom.xml