Skip to content
Browse files

CFID-228: extract common JAR (now requires Maven 3 for tomcat)

Change-Id: I8f6821214fc998c90c4a10ec644a7dcd456d4412
  • Loading branch information...
1 parent f81c3cb commit 917374ec4a288f96a29e4cece18c40fa60c6e52f @dsyer dsyer committed
Showing with 486 additions and 243 deletions.
  1. +10 −3 README.md
  2. +1 −1 bin/uaa
  3. +259 −0 common/pom.xml
  4. +3 −0 common/src/META-INF/MANIFEST.MF
  5. 0 .../test → common/src/main}/java/org/cloudfoundry/identity/uaa/NullSafeSystemProfileValueSource.java
  6. 0 {uaa/src/test → common/src/main}/java/org/cloudfoundry/identity/uaa/ParentContextLoader.java
  7. 0 {uaa/src/test → common/src/main}/java/org/cloudfoundry/identity/uaa/TestUtils.java
  8. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/audit/AuditEvent.java
  9. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/audit/AuditEventType.java
  10. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/audit/JdbcAuditService.java
  11. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/audit/LoggingAuditService.java
  12. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/audit/UaaAuditService.java
  13. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/audit/package-info.java
  14. 0 ...common}/src/main/java/org/cloudfoundry/identity/uaa/authentication/AuthzAuthenticationFilter.java
  15. 0 ...ommon}/src/main/java/org/cloudfoundry/identity/uaa/authentication/AuthzAuthenticationRequest.java
  16. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthentication.java
  17. 0 ... common}/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetails.java
  18. 0 ...n}/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetailsSource.java
  19. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaPrincipal.java
  20. 0 ...→ common}/src/main/java/org/cloudfoundry/identity/uaa/authentication/login/LoginInfoEndpoint.java
  21. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/authentication/login/Prompt.java
  22. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/authentication/login/PromptEditor.java
  23. 0 ...ommon}/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AccountLoginPolicy.java
  24. 0 ...rc/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManager.java
  25. 0 ...mmon}/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/PeriodLockoutPolicy.java
  26. 0 ...c/main/java/org/cloudfoundry/identity/uaa/authentication/manager/PermitAllAccountLoginPolicy.java
  27. 0 ... common}/src/main/java/org/cloudfoundry/identity/uaa/config/EnvironmentPropertiesFactoryBean.java
  28. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/config/HandlerAdapterFactoryBean.java
  29. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/config/YamlMapFactoryBean.java
  30. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/config/YamlPropertiesFactoryBean.java
  31. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/config/YamlServletProfileInitializer.java
  32. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/error/ConvertingExceptionView.java
  33. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/error/ExceptionHttpMessageConverter.java
  34. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/error/JsonAwareAccessDeniedHandler.java
  35. 0 ... common}/src/main/java/org/cloudfoundry/identity/uaa/error/JsonAwareAuthenticationEntryPoint.java
  36. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/event/AbstractUaaAuthenticationEvent.java
  37. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/event/AbstractUaaEvent.java
  38. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/event/UserAuthenticationFailureEvent.java
  39. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/event/UserAuthenticationSuccessEvent.java
  40. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/event/UserNotFoundEvent.java
  41. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/event/listener/AuditListener.java
  42. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/home/HomeController.java
  43. 0 .../src/test → common/src/main}/java/org/cloudfoundry/identity/uaa/integration/TestAccountSetup.java
  44. 0 ...est → common/src/main}/java/org/cloudfoundry/identity/uaa/integration/TestProfileEnvironment.java
  45. 0 {uaa/src/test → common/src/main}/java/org/cloudfoundry/identity/uaa/integration/UaaTestAccounts.java
  46. 0 {uaa/src/test → common/src/main}/java/org/cloudfoundry/identity/uaa/integration/UrlHelper.java
  47. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/oauth/AccessController.java
  48. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/oauth/AccessTokenConverter.java
  49. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/oauth/CheckTokenEndpoint.java
  50. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/oauth/ClientAdminBootstrap.java
  51. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/oauth/ClientAdminEndpoints.java
  52. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/oauth/DefaultTokenConverter.java
  53. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/oauth/JwtTokenServices.java
  54. +1 −1 ...identity/api → common/src/main/java/org/cloudfoundry/identity/uaa}/oauth/RemoteTokenServices.java
  55. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenAdminEndpoints.java
  56. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaUserApprovalHandler.java
  57. +2 −2 ...tity/app/web → common/src/main/java/org/cloudfoundry/identity/uaa/openid}/OpenIdClientFilter.java
  58. +3 −3 ...erDetails.java → common/src/main/java/org/cloudfoundry/identity/uaa/openid/OpenIdUserDetails.java
  59. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/openid/UserInfo.java
  60. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/openid/UserInfoEndpoint.java
  61. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/DefaultPasswordValidator.java
  62. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/InvalidPasswordException.java
  63. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/InvalidUserException.java
  64. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/JdbcPagingList.java
  65. +0 −1 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/JdbcScimUserProvisioning.java
  66. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/NullPasswordValidator.java
  67. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/PasswordChangeRequest.java
  68. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/PasswordValidator.java
  69. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimException.java
  70. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUser.java
  71. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserBootstrap.java
  72. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserEndpoints.java
  73. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserProvisioning.java
  74. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/SearchResults.java
  75. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/UserAlreadyExistsException.java
  76. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/UserNotFoundException.java
  77. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/json/JsonDateDeserializer.java
  78. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/scim/json/JsonDateSerializer.java
  79. 0 ... common}/src/main/java/org/cloudfoundry/identity/uaa/security/DefaultSecurityContextAccessor.java
  80. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/security/SecurityContextAccessor.java
  81. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/security/web/UaaRequestMatcher.java
  82. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/user/InMemoryUaaUserDatabase.java
  83. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java
  84. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/user/UaaAuthority.java
  85. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/user/UaaUser.java
  86. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/user/UaaUserDatabase.java
  87. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/user/UaaUserEditor.java
  88. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/user/package-info.java
  89. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/varz/MBeanMap.java
  90. 0 {uaa → common}/src/main/java/org/cloudfoundry/identity/uaa/varz/VarzEndpoint.java
  91. 0 {uaa → common}/src/main/resources/org/cloudfoundry/identity/uaa/schema-drop-hsqldb.sql
  92. 0 {uaa → common}/src/main/resources/org/cloudfoundry/identity/uaa/schema-drop-postgresql.sql
  93. 0 {uaa → common}/src/main/resources/org/cloudfoundry/identity/uaa/schema-hsqldb.sql
  94. 0 {uaa → common}/src/main/resources/org/cloudfoundry/identity/uaa/schema-postgresql.sql
  95. 0 {uaa → common}/src/main/sql/hsqldb.properties
  96. 0 {uaa → common}/src/main/sql/hsqldb.vpp
  97. 0 {uaa → common}/src/main/sql/postgresql.properties
  98. 0 {uaa → common}/src/main/sql/postgresql.vpp
  99. 0 {uaa → common}/src/main/sql/schema-drop.sql.vpp
  100. 0 {uaa → common}/src/main/sql/schema.sql.vpp
  101. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/audit/JdbcAuditServiceTests.java
  102. 0 ...n}/src/test/java/org/cloudfoundry/identity/uaa/authentication/AuthzAuthenticationFilterTests.java
  103. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/authentication/RubyUserTokenTests.java
  104. 0 ...mon}/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationTestFactory.java
  105. 0 ...→ common}/src/test/java/org/cloudfoundry/identity/uaa/authentication/login/PromptEditorTests.java
  106. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/authentication/login/PromptTests.java
  107. 0 ...st/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManagerTests.java
  108. 0 .../src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/PeriodLockoutPolicyTests.java
  109. 0 ...on}/src/test/java/org/cloudfoundry/identity/uaa/config/EnvironmentPropertiesFactoryBeanTests.java
  110. 0 ... → common}/src/test/java/org/cloudfoundry/identity/uaa/config/HandlerAdapterFactoryBeanTests.java
  111. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/config/YamlMapFactoryBeanTests.java
  112. 0 ... → common}/src/test/java/org/cloudfoundry/identity/uaa/config/YamlPropertiesFactoryBeanTests.java
  113. 0 ...ommon}/src/test/java/org/cloudfoundry/identity/uaa/config/YamlServletProfileInitializerTests.java
  114. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/error/ConvertingExceptionViewTests.java
  115. 0 ... common}/src/test/java/org/cloudfoundry/identity/uaa/error/JsonAwareAccessDeniedHandlerTests.java
  116. 0 ...on}/src/test/java/org/cloudfoundry/identity/uaa/error/JsonAwareAuthenticationEntryPointTests.java
  117. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/event/listener/AuditListenerTests.java
  118. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/oauth/AccessControllerTests.java
  119. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/oauth/CheckTokenEndpointTests.java
  120. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/oauth/JwtTokenServicesTests.java
  121. +2 −1 ...ity/api → common/src/test/java/org/cloudfoundry/identity/uaa}/oauth/RemoteTokenServicesTests.java
  122. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/oauth/TokenAdminEndpointsTests.java
  123. +2 −1 ...app/web → common/src/test/java/org/cloudfoundry/identity/uaa/openid}/OpenIdClientFilterTests.java
  124. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/openid/UserInfoEndpointTests.java
  125. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/scim/DefaultPasswordValidatorTests.java
  126. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/scim/JdbcPagingListTests.java
  127. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/scim/JdbcScimUserProvisioningTests.java
  128. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimExceptionStatusCodeMatcher.java
  129. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimUserBootstrapTests.java
  130. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimUserEndpointsTests.java
  131. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimUserTests.java
  132. 0 ...on}/src/test/java/org/cloudfoundry/identity/uaa/security/DefaultSecurityContextAccessorTests.java
  133. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/security/web/UaaRequestMatcherTests.java
  134. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabaseTests.java
  135. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/user/MockUaaUserDatabase.java
  136. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/user/UaaAuthorityTests.java
  137. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/user/UaaUserEditorTests.java
  138. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/user/UaaUserTestFactory.java
  139. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/varz/MBeanMapTests.java
  140. 0 {uaa → common}/src/test/java/org/cloudfoundry/identity/uaa/varz/VarzEndpointTests.java
  141. +41 −0 common/src/test/resources/log4j.properties
  142. +51 −0 common/src/test/resources/test-data-source.xml
  143. +4 −0 common/src/test/resources/test.properties
  144. +7 −1 pom.xml
  145. +39 −35 samples/api/pom.xml
  146. +1 −1 samples/api/src/main/webapp/WEB-INF/spring-servlet.xml
  147. +26 −34 samples/app/pom.xml
  148. +3 −2 samples/app/src/main/java/org/cloudfoundry/identity/app/web/TreeController.java
  149. +1 −1 samples/app/src/main/webapp/WEB-INF/spring-servlet.xml
  150. +5 −5 uaa/.springBeans
  151. +23 −149 uaa/pom.xml
  152. +1 −1 uaa/src/main/webapp/WEB-INF/spring-data-source.xml
  153. +1 −1 uaa/src/test/resources/test/profiles/vcap/uaa.yml
View
13 README.md
@@ -22,7 +22,9 @@ If this works you are in business:
Each module has a `mvn tomcat:run` target to run individually, or you
could import them as projects into STS (use 2.8.0 or better if you
can). The apps all work together the apps running on the same port
-(8080) as `/uaa`, `/app` and `/api`.
+(8080) as `/uaa`, `/app` and `/api`. You can probably use Maven 2.2.1
+to build the code, but you need to use Maven 3 if you want to run it
+from the command line (or run integration tests).
### Demo of command line usage
@@ -71,7 +73,7 @@ command line with `mvn tomcat:run -P integration`.
For individual modules, or for the whole project, you can also run
integration tests from the command line in one go with
- $ mvn integration-test -P integration
+ $ mvn test -P integration
(This might require an initial `mvn install` from the parent directory
to get the wars in your local repo first.)
@@ -111,7 +113,9 @@ To test against a vcap instance use the Maven profile `vcap`:
To change the target server it should suffice to set
`BVT_TARGET_DOMAIN` (the tests prefix it with `uaa.` to form the
-server url).
+server url), e.g.
+
+ $ BVT_TARGET_DOMAIN=appcloud21.dev.mozycloud rake bvt:run_uaa
You can also change individual properties on the command line with
`UAA_ARGS`, which are passed on to the mvn command line, or with
@@ -126,6 +130,9 @@ tests, but it can be used to set memory limits for the process etc.
There are actually several projects here, the main `uaa` server application and some samples:
+0. `common` is a module containing a JAR with all the business logic. It is used in
+the webapps below.
+
1. `uaa` is the actual UAA server
2. `gem` is a ruby gem (`cf-uaa-client`) for interacting with the UAA server
View
2 bin/uaa
@@ -56,7 +56,7 @@ logger.info("Tomcat JVM args: #{maven_opts}")
# The form of this next bit is very sensitive. We need the PID for
# logging so we need to exec from the shell to stay in the same
# process...
-pid = spawn("export MAVEN_OPTS=\"#{maven_opts}\" && exec mvn tomcat:run -P vcap", {:chdir=>root})
+pid = spawn("export MAVEN_OPTS=\"#{maven_opts}\" && exec mvn tomcat7:run -P vcap", {:chdir=>root})
logger.info("Tomcat PID = #{pid}")
View
259 common/pom.xml
@@ -0,0 +1,259 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.cloudfoundry.runtime</groupId>
+ <artifactId>cloudfoundry-identity-parent</artifactId>
+ <version>1.0.0.BUILD-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>cloudfoundry-identity-common</artifactId>
+ <packaging>jar</packaging>
+ <name>CloudFoundry Identity Common Jar</name>
+ <description>User Account and Authentication Service shared Java library code</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-sql</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <typedef resource="foundrylogic/vpp/typedef.properties" />
+ <taskdef resource="foundrylogic/vpp/taskdef.properties" />
+ <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <config>
+ <context>
+ <property key="includes" value="src/main/sql" />
+ <property file="${basedir}/src/main/sql/hsqldb.properties" />
+ </context>
+ <engine>
+ <property key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
+ </engine>
+ </config>
+ <fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
+ <mapper type="glob" from="*.sql.vpp" to="*-hsqldb.sql" />
+ </vppcopy>
+ <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+ <config>
+ <context>
+ <property key="includes" value="src/main/sql" />
+ <property file="${basedir}/src/main/sql/postgresql.properties" />
+ </context>
+ <engine>
+ <property key="velocimacro.library" value="src/main/sql/postgresql.vpp" />
+ </engine>
+ </config>
+ <fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
+ <mapper type="glob" from="*.sql.vpp" to="*-postgresql.sql" />
+ </vppcopy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.11</version>
+ <configuration>
+ <skip>${skipTests}</skip>
+ <includes>
+ <include>**/*Tests.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-jwt</artifactId>
+ <version>${spring.security.jwt.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security.oauth</groupId>
+ <artifactId>spring-security-oauth2</artifactId>
+ <version>${spring.security.oauth.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.vt.middleware</groupId>
+ <artifactId>vt-password</artifactId>
+ <version>3.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb-j5</artifactId>
+ <version>2.2.4</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>9.1-901.jdbc3</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Only needed for CC token serialization PoC -->
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby</artifactId>
+ <version>1.6.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
View
3 common/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
View
0 ...uaa/NullSafeSystemProfileValueSource.java → ...uaa/NullSafeSystemProfileValueSource.java
File renamed without changes.
View
0 ...dry/identity/uaa/ParentContextLoader.java → ...dry/identity/uaa/ParentContextLoader.java
File renamed without changes.
View
0 .../cloudfoundry/identity/uaa/TestUtils.java → .../cloudfoundry/identity/uaa/TestUtils.java
File renamed without changes.
View
0 ...oundry/identity/uaa/audit/AuditEvent.java → ...oundry/identity/uaa/audit/AuditEvent.java
File renamed without changes.
View
0 ...ry/identity/uaa/audit/AuditEventType.java → ...ry/identity/uaa/audit/AuditEventType.java
File renamed without changes.
View
0 .../identity/uaa/audit/JdbcAuditService.java → .../identity/uaa/audit/JdbcAuditService.java
File renamed without changes.
View
0 ...entity/uaa/audit/LoggingAuditService.java → ...entity/uaa/audit/LoggingAuditService.java
File renamed without changes.
View
0 ...y/identity/uaa/audit/UaaAuditService.java → ...y/identity/uaa/audit/UaaAuditService.java
File renamed without changes.
View
0 ...ndry/identity/uaa/audit/package-info.java → ...ndry/identity/uaa/audit/package-info.java
File renamed without changes.
View
0 ...entication/AuthzAuthenticationFilter.java → ...entication/AuthzAuthenticationFilter.java
File renamed without changes.
View
0 ...ntication/AuthzAuthenticationRequest.java → ...ntication/AuthzAuthenticationRequest.java
File renamed without changes.
View
0 ...uaa/authentication/UaaAuthentication.java → ...uaa/authentication/UaaAuthentication.java
File renamed without changes.
View
0 ...hentication/UaaAuthenticationDetails.java → ...hentication/UaaAuthenticationDetails.java
File renamed without changes.
View
0 ...ation/UaaAuthenticationDetailsSource.java → ...ation/UaaAuthenticationDetailsSource.java
File renamed without changes.
View
0 ...tity/uaa/authentication/UaaPrincipal.java → ...tity/uaa/authentication/UaaPrincipal.java
File renamed without changes.
View
0 ...thentication/login/LoginInfoEndpoint.java → ...thentication/login/LoginInfoEndpoint.java
File renamed without changes.
View
0 ...tity/uaa/authentication/login/Prompt.java → ...tity/uaa/authentication/login/Prompt.java
File renamed without changes.
View
0 ...aa/authentication/login/PromptEditor.java → ...aa/authentication/login/PromptEditor.java
File renamed without changes.
View
0 ...ntication/manager/AccountLoginPolicy.java → ...ntication/manager/AccountLoginPolicy.java
File renamed without changes.
View
0 ...n/manager/AuthzAuthenticationManager.java → ...n/manager/AuthzAuthenticationManager.java
File renamed without changes.
View
0 ...tication/manager/PeriodLockoutPolicy.java → ...tication/manager/PeriodLockoutPolicy.java
File renamed without changes.
View
0 .../manager/PermitAllAccountLoginPolicy.java → .../manager/PermitAllAccountLoginPolicy.java
File renamed without changes.
View
0 ...fig/EnvironmentPropertiesFactoryBean.java → ...fig/EnvironmentPropertiesFactoryBean.java
File renamed without changes.
View
0 ...uaa/config/HandlerAdapterFactoryBean.java → ...uaa/config/HandlerAdapterFactoryBean.java
File renamed without changes.
View
0 ...entity/uaa/config/YamlMapFactoryBean.java → ...entity/uaa/config/YamlMapFactoryBean.java
File renamed without changes.
View
0 ...uaa/config/YamlPropertiesFactoryBean.java → ...uaa/config/YamlPropertiesFactoryBean.java
File renamed without changes.
View
0 ...config/YamlServletProfileInitializer.java → ...config/YamlServletProfileInitializer.java
File renamed without changes.
View
0 ...ty/uaa/error/ConvertingExceptionView.java → ...ty/uaa/error/ConvertingExceptionView.java
File renamed without changes.
View
0 .../error/ExceptionHttpMessageConverter.java → .../error/ExceptionHttpMessageConverter.java
File renamed without changes.
View
0 ...a/error/JsonAwareAccessDeniedHandler.java → ...a/error/JsonAwareAccessDeniedHandler.java
File renamed without changes.
View
0 ...or/JsonAwareAuthenticationEntryPoint.java → ...or/JsonAwareAuthenticationEntryPoint.java
File renamed without changes.
View
0 ...event/AbstractUaaAuthenticationEvent.java → ...event/AbstractUaaAuthenticationEvent.java
File renamed without changes.
View
0 .../identity/uaa/event/AbstractUaaEvent.java → .../identity/uaa/event/AbstractUaaEvent.java
File renamed without changes.
View
0 ...event/UserAuthenticationFailureEvent.java → ...event/UserAuthenticationFailureEvent.java
File renamed without changes.
View
0 ...event/UserAuthenticationSuccessEvent.java → ...event/UserAuthenticationSuccessEvent.java
File renamed without changes.
View
0 ...identity/uaa/event/UserNotFoundEvent.java → ...identity/uaa/event/UserNotFoundEvent.java
File renamed without changes.
View
0 ...ity/uaa/event/listener/AuditListener.java → ...ity/uaa/event/listener/AuditListener.java
File renamed without changes.
View
0 ...dry/identity/uaa/home/HomeController.java → ...dry/identity/uaa/home/HomeController.java
File renamed without changes.
View
0 ...ity/uaa/integration/TestAccountSetup.java → ...ity/uaa/integration/TestAccountSetup.java
File renamed without changes.
View
0 ...a/integration/TestProfileEnvironment.java → ...a/integration/TestProfileEnvironment.java
File renamed without changes.
View
0 ...tity/uaa/integration/UaaTestAccounts.java → ...tity/uaa/integration/UaaTestAccounts.java
File renamed without changes.
View
0 ...y/identity/uaa/integration/UrlHelper.java → ...y/identity/uaa/integration/UrlHelper.java
File renamed without changes.
View
0 .../identity/uaa/oauth/AccessController.java → .../identity/uaa/oauth/AccessController.java
File renamed without changes.
View
0 ...ntity/uaa/oauth/AccessTokenConverter.java → ...ntity/uaa/oauth/AccessTokenConverter.java
File renamed without changes.
View
0 ...dentity/uaa/oauth/CheckTokenEndpoint.java → ...dentity/uaa/oauth/CheckTokenEndpoint.java
File renamed without changes.
View
0 ...ntity/uaa/oauth/ClientAdminBootstrap.java → ...ntity/uaa/oauth/ClientAdminBootstrap.java
File renamed without changes.
View
0 ...ntity/uaa/oauth/ClientAdminEndpoints.java → ...ntity/uaa/oauth/ClientAdminEndpoints.java
File renamed without changes.
View
0 ...tity/uaa/oauth/DefaultTokenConverter.java → ...tity/uaa/oauth/DefaultTokenConverter.java
File renamed without changes.
View
0 .../identity/uaa/oauth/JwtTokenServices.java → .../identity/uaa/oauth/JwtTokenServices.java
File renamed without changes.
View
2 ...entity/api/oauth/RemoteTokenServices.java → ...entity/uaa/oauth/RemoteTokenServices.java
@@ -10,7 +10,7 @@
* subcomponents is subject to the terms and conditions of the
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.api.oauth;
+package org.cloudfoundry.identity.uaa.oauth;
import java.io.UnsupportedEncodingException;
import java.util.Collection;
View
0 ...entity/uaa/oauth/TokenAdminEndpoints.java → ...entity/uaa/oauth/TokenAdminEndpoints.java
File renamed without changes.
View
0 ...ity/uaa/oauth/UaaUserApprovalHandler.java → ...ity/uaa/oauth/UaaUserApprovalHandler.java
File renamed without changes.
View
4 .../identity/app/web/OpenIdClientFilter.java → ...entity/uaa/openid/OpenIdClientFilter.java
@@ -10,7 +10,7 @@
* subcomponents is subject to the terms and conditions of the
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.app.web;
+package org.cloudfoundry.identity.uaa.openid;
import java.io.IOException;
import java.util.Arrays;
@@ -75,7 +75,7 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
}
String userId = map.get("user_id");
List<GrantedAuthority> authorities = Arrays.<GrantedAuthority> asList(new SimpleGrantedAuthority("ROLE_USER"));
- CustomUserDetails user = new CustomUserDetails(userId, authorities);
+ OpenIdUserDetails user = new OpenIdUserDetails(userId, authorities);
if (map.containsKey("email")) {
user.setEmail(map.get("email"));
}
View
6 ...y/identity/app/web/CustomUserDetails.java → ...dentity/uaa/openid/OpenIdUserDetails.java
@@ -10,7 +10,7 @@
* subcomponents is subject to the terms and conditions of the
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.app.web;
+package org.cloudfoundry.identity.uaa.openid;
import java.util.Collection;
@@ -23,12 +23,12 @@
* @author Luke Taylor
* @author Dave Syer
*/
-public class CustomUserDetails extends User {
+public class OpenIdUserDetails extends User {
private String email;
private String name;
private boolean newUser;
- public CustomUserDetails(String id, Collection<GrantedAuthority> authorities) {
+ public OpenIdUserDetails(String id, Collection<GrantedAuthority> authorities) {
super(id, "unused", authorities);
}
View
0 ...foundry/identity/uaa/openid/UserInfo.java → ...foundry/identity/uaa/openid/UserInfo.java
File renamed without changes.
View
0 ...identity/uaa/openid/UserInfoEndpoint.java → ...identity/uaa/openid/UserInfoEndpoint.java
File renamed without changes.
View
0 ...ty/uaa/scim/DefaultPasswordValidator.java → ...ty/uaa/scim/DefaultPasswordValidator.java
File renamed without changes.
View
0 ...ty/uaa/scim/InvalidPasswordException.java → ...ty/uaa/scim/InvalidPasswordException.java
File renamed without changes.
View
0 ...entity/uaa/scim/InvalidUserException.java → ...entity/uaa/scim/InvalidUserException.java
File renamed without changes.
View
0 ...dry/identity/uaa/scim/JdbcPagingList.java → ...dry/identity/uaa/scim/JdbcPagingList.java
File renamed without changes.
View
1 ...ty/uaa/scim/JdbcScimUserProvisioning.java → ...ty/uaa/scim/JdbcScimUserProvisioning.java
@@ -30,7 +30,6 @@
import org.cloudfoundry.identity.uaa.scim.ScimUser.Meta;
import org.cloudfoundry.identity.uaa.scim.ScimUser.Name;
import org.cloudfoundry.identity.uaa.user.UaaAuthority;
-import org.springframework.dao.DataAccessException;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
View
0 ...ntity/uaa/scim/NullPasswordValidator.java → ...ntity/uaa/scim/NullPasswordValidator.java
File renamed without changes.
View
0 ...ntity/uaa/scim/PasswordChangeRequest.java → ...ntity/uaa/scim/PasswordChangeRequest.java
File renamed without changes.
View
0 .../identity/uaa/scim/PasswordValidator.java → .../identity/uaa/scim/PasswordValidator.java
File renamed without changes.
View
0 ...ndry/identity/uaa/scim/ScimException.java → ...ndry/identity/uaa/scim/ScimException.java
File renamed without changes.
View
0 ...udfoundry/identity/uaa/scim/ScimUser.java → ...udfoundry/identity/uaa/scim/ScimUser.java
File renamed without changes.
View
0 .../identity/uaa/scim/ScimUserBootstrap.java → .../identity/uaa/scim/ScimUserBootstrap.java
File renamed without changes.
View
0 .../identity/uaa/scim/ScimUserEndpoints.java → .../identity/uaa/scim/ScimUserEndpoints.java
File renamed without changes.
View
0 ...entity/uaa/scim/ScimUserProvisioning.java → ...entity/uaa/scim/ScimUserProvisioning.java
File renamed without changes.
View
0 ...ndry/identity/uaa/scim/SearchResults.java → ...ndry/identity/uaa/scim/SearchResults.java
File renamed without changes.
View
0 .../uaa/scim/UserAlreadyExistsException.java → .../uaa/scim/UserAlreadyExistsException.java
File renamed without changes.
View
0 ...ntity/uaa/scim/UserNotFoundException.java → ...ntity/uaa/scim/UserNotFoundException.java
File renamed without changes.
View
0 ...y/uaa/scim/json/JsonDateDeserializer.java → ...y/uaa/scim/json/JsonDateDeserializer.java
File renamed without changes.
View
0 ...ity/uaa/scim/json/JsonDateSerializer.java → ...ity/uaa/scim/json/JsonDateSerializer.java
File renamed without changes.
View
0 ...urity/DefaultSecurityContextAccessor.java → ...urity/DefaultSecurityContextAccessor.java
File renamed without changes.
View
0 ...uaa/security/SecurityContextAccessor.java → ...uaa/security/SecurityContextAccessor.java
File renamed without changes.
View
0 ...y/uaa/security/web/UaaRequestMatcher.java → ...y/uaa/security/web/UaaRequestMatcher.java
File renamed without changes.
View
0 ...ity/uaa/user/InMemoryUaaUserDatabase.java → ...ity/uaa/user/InMemoryUaaUserDatabase.java
File renamed without changes.
View
0 ...dentity/uaa/user/JdbcUaaUserDatabase.java → ...dentity/uaa/user/JdbcUaaUserDatabase.java
File renamed without changes.
View
0 ...undry/identity/uaa/user/UaaAuthority.java → ...undry/identity/uaa/user/UaaAuthority.java
File renamed without changes.
View
0 ...oudfoundry/identity/uaa/user/UaaUser.java → ...oudfoundry/identity/uaa/user/UaaUser.java
File renamed without changes.
View
0 ...ry/identity/uaa/user/UaaUserDatabase.java → ...ry/identity/uaa/user/UaaUserDatabase.java
File renamed without changes.
View
0 ...ndry/identity/uaa/user/UaaUserEditor.java → ...ndry/identity/uaa/user/UaaUserEditor.java
File renamed without changes.
View
0 ...undry/identity/uaa/user/package-info.java → ...undry/identity/uaa/user/package-info.java
File renamed without changes.
View
0 ...udfoundry/identity/uaa/varz/MBeanMap.java → ...udfoundry/identity/uaa/varz/MBeanMap.java
File renamed without changes.
View
0 ...undry/identity/uaa/varz/VarzEndpoint.java → ...undry/identity/uaa/varz/VarzEndpoint.java
File renamed without changes.
View
0 ...undry/identity/uaa/schema-drop-hsqldb.sql → ...undry/identity/uaa/schema-drop-hsqldb.sql
File renamed without changes.
View
0 ...y/identity/uaa/schema-drop-postgresql.sql → ...y/identity/uaa/schema-drop-postgresql.sql
File renamed without changes.
View
0 ...oudfoundry/identity/uaa/schema-hsqldb.sql → ...oudfoundry/identity/uaa/schema-hsqldb.sql
File renamed without changes.
View
0 ...oundry/identity/uaa/schema-postgresql.sql → ...oundry/identity/uaa/schema-postgresql.sql
File renamed without changes.
View
0 uaa/src/main/sql/hsqldb.properties → common/src/main/sql/hsqldb.properties
File renamed without changes.
View
0 uaa/src/main/sql/hsqldb.vpp → common/src/main/sql/hsqldb.vpp
File renamed without changes.
View
0 uaa/src/main/sql/postgresql.properties → common/src/main/sql/postgresql.properties
File renamed without changes.
View
0 uaa/src/main/sql/postgresql.vpp → common/src/main/sql/postgresql.vpp
File renamed without changes.
View
0 uaa/src/main/sql/schema-drop.sql.vpp → common/src/main/sql/schema-drop.sql.vpp
File renamed without changes.
View
0 uaa/src/main/sql/schema.sql.vpp → common/src/main/sql/schema.sql.vpp
File renamed without changes.
View
0 ...tity/uaa/audit/JdbcAuditServiceTests.java → ...tity/uaa/audit/JdbcAuditServiceTests.java
File renamed without changes.
View
0 ...ation/AuthzAuthenticationFilterTests.java → ...ation/AuthzAuthenticationFilterTests.java
File renamed without changes.
View
0 ...aa/authentication/RubyUserTokenTests.java → ...aa/authentication/RubyUserTokenTests.java
File renamed without changes.
View
0 ...ication/UaaAuthenticationTestFactory.java → ...ication/UaaAuthenticationTestFactory.java
File renamed without changes.
View
0 ...thentication/login/PromptEditorTests.java → ...thentication/login/PromptEditorTests.java
File renamed without changes.
View
0 ...uaa/authentication/login/PromptTests.java → ...uaa/authentication/login/PromptTests.java
File renamed without changes.
View
0 ...ager/AuthzAuthenticationManagerTests.java → ...ager/AuthzAuthenticationManagerTests.java
File renamed without changes.
View
0 ...ion/manager/PeriodLockoutPolicyTests.java → ...ion/manager/PeriodLockoutPolicyTests.java
File renamed without changes.
View
0 ...nvironmentPropertiesFactoryBeanTests.java → ...nvironmentPropertiesFactoryBeanTests.java
File renamed without changes.
View
0 ...onfig/HandlerAdapterFactoryBeanTests.java → ...onfig/HandlerAdapterFactoryBeanTests.java
File renamed without changes.
View
0 ...y/uaa/config/YamlMapFactoryBeanTests.java → ...y/uaa/config/YamlMapFactoryBeanTests.java
File renamed without changes.
View
0 ...onfig/YamlPropertiesFactoryBeanTests.java → ...onfig/YamlPropertiesFactoryBeanTests.java
File renamed without changes.
View
0 ...g/YamlServletProfileInitializerTests.java → ...g/YamlServletProfileInitializerTests.java
File renamed without changes.
View
0 ...a/error/ConvertingExceptionViewTests.java → ...a/error/ConvertingExceptionViewTests.java
File renamed without changes.
View
0 ...or/JsonAwareAccessDeniedHandlerTests.java → ...or/JsonAwareAccessDeniedHandlerTests.java
File renamed without changes.
View
0 ...onAwareAuthenticationEntryPointTests.java → ...onAwareAuthenticationEntryPointTests.java
File renamed without changes.
View
0 ...aa/event/listener/AuditListenerTests.java → ...aa/event/listener/AuditListenerTests.java
File renamed without changes.
View
0 ...tity/uaa/oauth/AccessControllerTests.java → ...tity/uaa/oauth/AccessControllerTests.java
File renamed without changes.
View
0 ...ty/uaa/oauth/CheckTokenEndpointTests.java → ...ty/uaa/oauth/CheckTokenEndpointTests.java
File renamed without changes.
View
0 ...tity/uaa/oauth/JwtTokenServicesTests.java → ...tity/uaa/oauth/JwtTokenServicesTests.java
File renamed without changes.
View
3 ...y/api/oauth/RemoteTokenServicesTests.java → ...y/uaa/oauth/RemoteTokenServicesTests.java
@@ -10,7 +10,7 @@
* subcomponents is subject to the terms and conditions of the
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.api.oauth;
+package org.cloudfoundry.identity.uaa.oauth;
import static org.junit.Assert.*;
@@ -18,6 +18,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.cloudfoundry.identity.uaa.oauth.RemoteTokenServices;
import org.junit.Test;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
View
0 ...y/uaa/oauth/TokenAdminEndpointsTests.java → ...y/uaa/oauth/TokenAdminEndpointsTests.java
File renamed without changes.
View
3 ...tity/app/web/OpenIdClientFilterTests.java → ...y/uaa/openid/OpenIdClientFilterTests.java
@@ -10,7 +10,7 @@
* subcomponents is subject to the terms and conditions of the
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.app.web;
+package org.cloudfoundry.identity.uaa.openid;
import static org.junit.Assert.assertNotNull;
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.cloudfoundry.identity.uaa.openid.OpenIdClientFilter;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
View
0 ...ity/uaa/openid/UserInfoEndpointTests.java → ...ity/uaa/openid/UserInfoEndpointTests.java
File renamed without changes.
View
0 ...a/scim/DefaultPasswordValidatorTests.java → ...a/scim/DefaultPasswordValidatorTests.java
File renamed without changes.
View
0 ...dentity/uaa/scim/JdbcPagingListTests.java → ...dentity/uaa/scim/JdbcPagingListTests.java
File renamed without changes.
View
0 ...a/scim/JdbcScimUserProvisioningTests.java → ...a/scim/JdbcScimUserProvisioningTests.java
File renamed without changes.
View
0 .../scim/ScimExceptionStatusCodeMatcher.java → .../scim/ScimExceptionStatusCodeMatcher.java
File renamed without changes.
View
0 ...tity/uaa/scim/ScimUserBootstrapTests.java → ...tity/uaa/scim/ScimUserBootstrapTests.java
File renamed without changes.
View
0 ...tity/uaa/scim/ScimUserEndpointsTests.java → ...tity/uaa/scim/ScimUserEndpointsTests.java
File renamed without changes.
View
0 ...ndry/identity/uaa/scim/ScimUserTests.java → ...ndry/identity/uaa/scim/ScimUserTests.java
File renamed without changes.
View
0 .../DefaultSecurityContextAccessorTests.java → .../DefaultSecurityContextAccessorTests.java
File renamed without changes.
View
0 .../security/web/UaaRequestMatcherTests.java → .../security/web/UaaRequestMatcherTests.java
File renamed without changes.
View
0 ...ty/uaa/user/JdbcUaaUserDatabaseTests.java → ...ty/uaa/user/JdbcUaaUserDatabaseTests.java
File renamed without changes.
View
0 ...dentity/uaa/user/MockUaaUserDatabase.java → ...dentity/uaa/user/MockUaaUserDatabase.java
File renamed without changes.
View
0 .../identity/uaa/user/UaaAuthorityTests.java → .../identity/uaa/user/UaaAuthorityTests.java
File renamed without changes.
View
0 ...identity/uaa/user/UaaUserEditorTests.java → ...identity/uaa/user/UaaUserEditorTests.java
File renamed without changes.
View
0 ...identity/uaa/user/UaaUserTestFactory.java → ...identity/uaa/user/UaaUserTestFactory.java
File renamed without changes.
View
0 ...ndry/identity/uaa/varz/MBeanMapTests.java → ...ndry/identity/uaa/varz/MBeanMapTests.java
File renamed without changes.
View
0 .../identity/uaa/varz/VarzEndpointTests.java → .../identity/uaa/varz/VarzEndpointTests.java
File renamed without changes.
View
41 common/src/test/resources/log4j.properties
@@ -0,0 +1,41 @@
+#
+# Cloud Foundry 2012.02.03 Beta
+# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+#
+
+log4j.rootCategory=INFO, CONSOLE, FILE
+
+PID=????
+catalina.base=/tmp
+LOG_PATH=${catalina.base}/logs
+LOG_FILE=${LOG_PATH}/uaa.log
+LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] uaa - ${PID} [%t] .... %5p --- %c{1}: %m%n
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=${LOG_PATTERN}
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.File=${LOG_FILE}
+log4j.appender.FILE.MaxFileSize=10MB
+log4j.appender.FILE.layout = org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=${LOG_PATTERN}
+
+log4j.category.org.springframework.security=DEBUG
+log4j.category.org.cloudfoundry.identity=DEBUG
+log4j.category.org.springframework.web=DEBUG
+log4j.category.org.springframework.jdbc.datasource=DEBUG
+log4j.category.org.springframework.jdbc.datasource.DataSourceUtils=INFO
+#log4j.category.UAA.Audit=TRACE
+#log4j.category.org.springframework.beans.factory.support=DEBUG
+log4j.category.org.springframework.web.context.support.StandardServletEnvironment=INFO
+# log4j.category.org.apache.http.wire=DEBUG
View
51 common/src/test/resources/test-data-source.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Cloud Foundry 2012.02.03 Beta
+ Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+
+ This product is licensed to you under the Apache License, Version 2.0 (the "License").
+ You may not use this product except in compliance with the License.
+
+ This product includes a number of subcomponents with
+ separate copyright notices and license terms. Your use of these
+ subcomponents is subject to the terms and conditions of the
+ subcomponent's license, as noted in the LICENSE file.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+ xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+
+ <context:property-placeholder location="test.properties"/>
+
+ <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="${database.driverClassName:org.hsqldb.jdbcDriver}" />
+ <property name="url" value="${database.url:jdbc:hsqldb:mem:jdbcUaaTests}" />
+ <property name="username" value="${database.username:sa}" />
+ <property name="password" value="${database.password:}" />
+ </bean>
+
+ <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
+ <property name="dataSource" ref="dataSource" />
+ </bean>
+
+ <jdbc:initialize-database ignore-failures="ALL" data-source="dataSource">
+ <jdbc:script location="classpath:org/cloudfoundry/identity/uaa/schema-#{@platform}.sql" />
+ </jdbc:initialize-database>
+
+ <beans profile="default,hsqldb">
+ <bean id="platform" class="java.lang.String">
+ <constructor-arg value="hsqldb" />
+ </bean>
+ </beans>
+
+ <beans profile="postgresql">
+ <bean id="platform" class="java.lang.String">
+ <constructor-arg value="postgresql" />
+ </bean>
+ </beans>
+
+</beans>
View
4 common/src/test/resources/test.properties
@@ -0,0 +1,4 @@
+database.driverClassName: org.hsqldb.jdbcDriver
+database.url: jdbc:hsqldb:mem:jdbcUaaTests
+database.username: sa
+database.password:
View
8 pom.xml
@@ -7,8 +7,9 @@
<packaging>pom</packaging>
<version>1.0.0.BUILD-SNAPSHOT</version>
<modules>
+ <module>common</module>
<module>uaa</module>
- <!--module>samples</module-->
+ <module>samples</module>
</modules>
<properties>
<spring.version>3.1.1.RELEASE</spring.version>
@@ -208,6 +209,11 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>maven-emma-plugin</artifactId>
View
74 samples/api/pom.xml
@@ -16,6 +16,12 @@
<properties>
<m2eclipse.wtp.contextRoot>/api</m2eclipse.wtp.contextRoot>
+ <!-- Brain dead install plugin (Maven 3) cannot extract this stuff from its own configuration -->
+ <file>target/${project.artifactId}-${project.version}.war</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>api</artifactId>
+ <version>${project.version}</version>
+ <packaging>war</packaging>
</properties>
<profiles>
@@ -29,7 +35,7 @@
<executions>
<execution>
<id>start-tomcat</id>
- <phase>pre-integration-test</phase>
+ <phase>process-test-sources</phase>
<goals>
<goal>run</goal>
</goals>
@@ -42,13 +48,29 @@
<addContextWarDependencies>true</addContextWarDependencies>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start-tomcat</id>
+ <phase>none</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <fork>true</fork>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>uaa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>war</type>
<scope>tomcat</scope>
</dependency>
@@ -76,17 +98,16 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <configuration>
+ <path>/api</path>
+ <addContextWarDependencies>true</addContextWarDependencies>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<skip>${skipTests}</skip>
<includes>
@@ -109,10 +130,10 @@
</goals>
<inherited>false</inherited>
<configuration>
- <file>target/${pom.artifactId}-${pom.version}.war</file>
- <groupId>${pom.groupId}</groupId>
+ <file>target/${project.artifactId}-${project.version}.war</file>
+ <groupId>${project.groupId}</groupId>
<artifactId>api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<packaging>war</packaging>
</configuration>
</execution>
@@ -125,26 +146,9 @@
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cloudfoundry-identity-uaa</artifactId>
- <version>${pom.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <!-- Only needed by wtp? -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cloudfoundry-identity-uaa</artifactId>
- <type>war</type>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cloudfoundry-identity-uaa</artifactId>
- <version>${pom.version}</version>
- <classifier>classes</classifier>
- <scope>test</scope>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cloudfoundry-identity-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
View
2 samples/api/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -63,7 +63,7 @@
</property>
</bean>
- <bean id="tokenServices" class="org.cloudfoundry.identity.api.oauth.RemoteTokenServices">
+ <bean id="tokenServices" class="org.cloudfoundry.identity.uaa.oauth.RemoteTokenServices">
<property name="checkTokenEndpointUrl" value="${checkTokenEndpointUrl}" />
<property name="clientId" value="app" />
<property name="clientSecret" value="appclientsecret" />
View
60 samples/app/pom.xml
@@ -29,7 +29,23 @@
<executions>
<execution>
<id>start-tomcat</id>
- <phase>pre-integration-test</phase>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <fork>true</fork>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start-tomcat</id>
+ <phase>none</phase>
<goals>
<goal>run</goal>
</goals>
@@ -43,16 +59,16 @@
</build>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>uaa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>war</type>
<scope>tomcat</scope>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>war</type>
<scope>tomcat</scope>
</dependency>
@@ -83,15 +99,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<skip>${skipTests}</skip>
<includes>
@@ -107,28 +114,13 @@
</build>
<dependencies>
+
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cloudfoundry-identity-uaa</artifactId>
- <version>${pom.version}</version>
- <classifier>classes</classifier>
- <scope>test</scope>
- </dependency>
- <!-- Only needed by wtp? -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cloudfoundry-identity-uaa</artifactId>
- <version>${pom.version}</version>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cloudfoundry-identity-uaa</artifactId>
- <version>${pom.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cloudfoundry-identity-common</artifactId>
+ <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
View
5 samples/app/src/main/java/org/cloudfoundry/identity/app/web/TreeController.java
@@ -17,6 +17,7 @@
import java.util.List;
import java.util.Map;
+import org.cloudfoundry.identity.uaa.openid.OpenIdUserDetails;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
@@ -48,8 +49,8 @@ public String apps(Model model, Principal principal) throws Exception {
private void addUserInfo(Model model, Principal principal) {
model.addAttribute("principal", principal);
Map<String,String> attributes = new HashMap<String, String>();
- if (principal instanceof CustomUserDetails) {
- CustomUserDetails user = (CustomUserDetails) principal;
+ if (principal instanceof OpenIdUserDetails) {
+ OpenIdUserDetails user = (OpenIdUserDetails) principal;
model.addAttribute("userName", user.getUsername());
model.addAttribute("email", user.getEmail());
}
View
2 samples/app/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -36,7 +36,7 @@
<!--apply the oauth client context -->
<oauth:client id="oauth2ClientFilter" />
- <bean id="openidClientFilter" class="org.cloudfoundry.identity.app.web.OpenIdClientFilter">
+ <bean id="openidClientFilter" class="org.cloudfoundry.identity.uaa.openid.OpenIdClientFilter">
<constructor-arg value="/login" />
<property name="authenticationManager" ref="authenticationManager" />
<property name="restTemplate">
View
10 uaa/.springBeans
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
- <pluginVersion><![CDATA[2.8.1.201111220115-RELEASE]]></pluginVersion>
+ <pluginVersion><![CDATA[2.8.0.201110170010-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
- <config>src/main/webapp/WEB-INF/spring-servlet.xml</config>
- <config>src/main/webapp/WEB-INF/spring-scim.xml</config>
- <config>src/test/resources/test-data-source.xml</config>
+ <config>src/main/webapp/WEB-INF/env-context.xml</config>
<config>src/main/resources/META-INF/spring/batch/jobs/jobs.xml</config>
+ <config>src/main/webapp/WEB-INF/oauth-clients.xml</config>
<config>src/main/webapp/WEB-INF/spring-data-source.xml</config>
+ <config>src/main/webapp/WEB-INF/spring-scim.xml</config>
+ <config>src/test/resources/test-data-source.xml</config>
<config>src/test/resources/test/config/test-override.xml</config>
- <config>src/main/webapp/WEB-INF/env-context.xml</config>
</configs>
<configSets>
</configSets>
View
172 uaa/pom.xml
@@ -19,6 +19,13 @@
<m2eclipse.wtp.contextRoot>/uaa</m2eclipse.wtp.contextRoot>
<uaa.path>/uaa</uaa.path>
<CLOUD_FOUNDRY_CONFIG_PATH></CLOUD_FOUNDRY_CONFIG_PATH>
+ <!-- Brain dead install plugin (Maven 3) cannot extract this stuff from its own configuration-->
+ <file>target/${project.artifactId}-${project.version}.war</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>uaa</artifactId>
+ <version>${project.version}</version>
+ <packaging>war</packaging>
+ <generatePom>true</generatePom>
</properties>
<profiles>
@@ -45,7 +52,7 @@
<executions>
<execution>
<id>start-tomcat</id>
- <phase>pre-integration-test</phase>
+ <phase>process-test-sources</phase>
<goals>
<goal>run</goal>
</goals>
@@ -58,26 +65,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- <execution>
- <id>default-test</id>
- <phase>test</phase>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
@@ -86,51 +73,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-sql</id>
- <phase>generate-sources</phase>
- <configuration>
- <target>
- <typedef resource="foundrylogic/vpp/typedef.properties" />
- <taskdef resource="foundrylogic/vpp/taskdef.properties" />
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
- <config>
- <context>
- <property key="includes" value="src/main/sql" />
- <property file="${basedir}/src/main/sql/hsqldb.properties" />
- </context>
- <engine>
- <property key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
- </engine>
- </config>
- <fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
- <mapper type="glob" from="*.sql.vpp" to="*-hsqldb.sql" />
- </vppcopy>
- <vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
- <config>
- <context>
- <property key="includes" value="src/main/sql" />
- <property file="${basedir}/src/main/sql/postgresql.properties" />
- </context>
- <engine>
- <property key="velocimacro.library" value="src/main/sql/postgresql.vpp" />
- </engine>
- </config>
- <fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
- <mapper type="glob" from="*.sql.vpp" to="*-postgresql.sql" />
- </vppcopy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>1.9</version>
@@ -148,25 +90,6 @@
<generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <attachClasses>true</attachClasses>
- </configuration>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -178,6 +101,13 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <configuration>
+ <path>${uaa.path}</path>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.11</version>
@@ -198,6 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
<executions>
<execution>
<id></id>
@@ -207,10 +138,10 @@
</goals>
<inherited>false</inherited>
<configuration>
- <file>target/${pom.artifactId}-${pom.version}.war</file>
- <groupId>${pom.groupId}</groupId>
+ <file>target/${project.artifactId}-${project.version}.war</file>
+ <groupId>${project.groupId}</groupId>
<artifactId>uaa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<packaging>war</packaging>
<generatePom>true</generatePom>
</configuration>
@@ -236,9 +167,10 @@
<dependencies>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-jwt</artifactId>
- <version>${spring.security.jwt.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cloudfoundry-identity-common</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -248,12 +180,6 @@
</dependency>
<dependency>
- <groupId>org.springframework.security.oauth</groupId>
- <artifactId>spring-security-oauth2</artifactId>
- <version>${spring.security.oauth.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
@@ -316,25 +242,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-taglibs</artifactId>
- <version>${spring.security.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${spring.security.version}</version>
<scope>runtime</scope>
@@ -376,18 +283,6 @@
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
-
- <dependency>
- <groupId>edu.vt.middleware</groupId>
- <artifactId>vt-password</artifactId>
- <version>3.1.1</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
@@ -395,19 +290,6 @@
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.1.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.9</version>
- </dependency>
-
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb-j5</artifactId>
<version>2.2.4</version>
@@ -428,14 +310,6 @@
<scope>test</scope>
</dependency>
- <!-- Only needed for CC token serialization PoC -->
- <dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby</artifactId>
- <version>1.6.5</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
View
2 uaa/src/main/webapp/WEB-INF/spring-data-source.xml
@@ -50,7 +50,7 @@
</bean>
<jdbc:initialize-database ignore-failures="ALL" data-source="dataSource">
- <jdbc:script location="classpath:org/cloudfoundry/identity/uaa/schema-#{@platform}.sql" />
+ <jdbc:script location="classpath*:org/cloudfoundry/identity/uaa/schema-#{@platform}.sql" />
</jdbc:initialize-database>
</beans>
View
2 uaa/src/test/resources/test/profiles/vcap/uaa.yml
@@ -8,7 +8,7 @@ uaa:
password: dr0wssaPH@ck
host: uaa.${VCAP_BVT_TARGET:vcap.me}
port: 80
- path: /war
+ path: /
cloud_controller:
database:

0 comments on commit 917374e

Please sign in to comment.
Something went wrong with that request. Please try again.