Browse Source

refactored project into four modules:

Common
 Client
 Server Library
 Server Webapp

addresses #367
pull/516/head
Justin Richer 11 years ago
parent
commit
8a5a16f374
  1. 2
      .gitignore
  2. 1
      openid-connect-client/.gitignore
  3. 14
      openid-connect-client/.springBeans
  4. 2
      openid-connect-common/.gitignore
  5. 12
      openid-connect-server-webapp/.gitignore
  6. 65
      openid-connect-server-webapp/pom.xml
  7. 0
      openid-connect-server-webapp/src/main/resources/db/clients.sql
  8. 0
      openid-connect-server-webapp/src/main/resources/db/scopes.sql
  9. 0
      openid-connect-server-webapp/src/main/resources/db/tables/hsql_database_tables.sql
  10. 0
      openid-connect-server-webapp/src/main/resources/db/tables/loading_temp_tables.sql
  11. 0
      openid-connect-server-webapp/src/main/resources/db/tables/mysql_database_tables.sql
  12. 0
      openid-connect-server-webapp/src/main/resources/db/tables/security-schema.sql
  13. 0
      openid-connect-server-webapp/src/main/resources/db/users.sql
  14. 0
      openid-connect-server-webapp/src/main/resources/keystore.jwks
  15. 0
      openid-connect-server-webapp/src/main/resources/log4j.xml
  16. 0
      openid-connect-server-webapp/src/main/webapp/META-INF/MANIFEST.MF
  17. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml
  18. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/crypto-config.xml
  19. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml
  20. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/local-config.xml
  21. 2
      openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml
  22. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/spring-servlet.xml
  23. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
  24. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/actionmenu.tag
  25. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/breadcrumbs.tag
  26. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag
  27. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/copyright.tag
  28. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/footer.tag
  29. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/header.tag
  30. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
  31. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
  32. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
  33. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
  34. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/sidebar.tag
  35. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag
  36. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
  37. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/task-config.xml
  38. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/user-context.xml
  39. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp
  40. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/views/approve.jsp
  41. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp
  42. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
  43. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp
  44. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp
  45. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp
  46. 0
      openid-connect-server-webapp/src/main/webapp/WEB-INF/web.xml
  47. 0
      openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.css
  48. 0
      openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.min.css
  49. 0
      openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap.css
  50. 0
      openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css
  51. 0
      openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings-white.png
  52. 0
      openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings.png
  53. 0
      openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/js/bootstrap.js
  54. 0
      openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/js/bootstrap.min.js
  55. 0
      openid-connect-server-webapp/src/main/webapp/resources/fonts/open_sans_400.woff
  56. 0
      openid-connect-server-webapp/src/main/webapp/resources/fonts/open_sans_700.woff
  57. 0
      openid-connect-server-webapp/src/main/webapp/resources/images/canvas.png
  58. 0
      openid-connect-server-webapp/src/main/webapp/resources/images/openid_connect_large.png
  59. 0
      openid-connect-server-webapp/src/main/webapp/resources/images/openid_connect_small.png
  60. 0
      openid-connect-server-webapp/src/main/webapp/resources/images/openid_small.png
  61. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
  62. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/client.js
  63. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
  64. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/grant.js
  65. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/lib/backbone.js
  66. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/lib/backbone.validations.js
  67. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/lib/bootstrapx-clickover.js
  68. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/lib/jquery.js
  69. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/lib/moment.js
  70. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/lib/purl.js
  71. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/lib/underscore.js
  72. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/scope.js
  73. 0
      openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js
  74. 0
      openid-connect-server-webapp/src/main/webapp/resources/static_resources_go_here
  75. 0
      openid-connect-server-webapp/src/main/webapp/resources/template/admin.html
  76. 0
      openid-connect-server-webapp/src/main/webapp/resources/template/client.html
  77. 0
      openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html
  78. 0
      openid-connect-server-webapp/src/main/webapp/resources/template/grant.html
  79. 0
      openid-connect-server-webapp/src/main/webapp/resources/template/scope.html
  80. 0
      openid-connect-server-webapp/src/main/webapp/resources/template/whitelist.html
  81. 0
      openid-connect-server-webapp/src/main/webapp/resources/test/json/clients.js
  82. 51
      openid-connect-server/pom.xml
  83. 8
      pom.xml

2
.gitignore vendored

@ -8,3 +8,5 @@ bin
.project
.settings
.classpath
/target
.springBeans

1
openid-connect-client/.gitignore vendored

@ -9,3 +9,4 @@ bin
.settings
.classpath
/target
.springBeans

14
openid-connect-client/.springBeans

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.9.1.201203220057-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>spring-servlet.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>

2
openid-connect-common/.gitignore vendored

@ -8,3 +8,5 @@ bin
.project
.settings
.classpath
/target
.springBeans

12
openid-connect-server-webapp/.gitignore vendored

@ -0,0 +1,12 @@
local-values.conf
target
*~
bin
*.idea
*.iml
*.eml
.project
.settings
.classpath
/target
.springBeans

65
openid-connect-server-webapp/pom.xml

@ -0,0 +1,65 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>openid-connect-server-webapp</artifactId>
<packaging>war</packaging>
<name>OpenID Connect Server Webapp</name>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java-version}</source>
<target>${java-version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>openid-connect-server-webapp</warName>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>gif</nonFilteredFileExtension>
<nonFilteredFileExtension>ico</nonFilteredFileExtension>
<nonFilteredFileExtension>jpg</nonFilteredFileExtension>
<nonFilteredFileExtension>png</nonFilteredFileExtension>
<nonFilteredFileExtension>pdf</nonFilteredFileExtension>
</nonFilteredFileExtensions>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>true</filtering>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<goals>
<goal>sources</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-server</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

0
openid-connect-server/src/main/resources/db/clients.sql → openid-connect-server-webapp/src/main/resources/db/clients.sql

0
openid-connect-server/src/main/resources/db/scopes.sql → openid-connect-server-webapp/src/main/resources/db/scopes.sql

0
openid-connect-server/src/main/resources/db/tables/hsql_database_tables.sql → openid-connect-server-webapp/src/main/resources/db/tables/hsql_database_tables.sql

0
openid-connect-server/src/main/resources/db/tables/loading_temp_tables.sql → openid-connect-server-webapp/src/main/resources/db/tables/loading_temp_tables.sql

0
openid-connect-server/src/main/resources/db/tables/mysql_database_tables.sql → openid-connect-server-webapp/src/main/resources/db/tables/mysql_database_tables.sql

0
openid-connect-server/src/main/resources/db/tables/security-schema.sql → openid-connect-server-webapp/src/main/resources/db/tables/security-schema.sql

0
openid-connect-server/src/main/resources/db/users.sql → openid-connect-server-webapp/src/main/resources/db/users.sql

0
openid-connect-server/src/main/resources/keystore.jwks → openid-connect-server-webapp/src/main/resources/keystore.jwks

0
openid-connect-server/src/main/resources/log4j.xml → openid-connect-server-webapp/src/main/resources/log4j.xml

0
openid-connect-server/src/main/webapp/META-INF/MANIFEST.MF → openid-connect-server-webapp/src/main/webapp/META-INF/MANIFEST.MF

0
openid-connect-server/src/main/webapp/WEB-INF/application-context.xml → openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml

0
openid-connect-server/src/main/webapp/WEB-INF/crypto-config.xml → openid-connect-server-webapp/src/main/webapp/WEB-INF/crypto-config.xml

0
openid-connect-server/src/main/webapp/WEB-INF/data-context.xml → openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml

0
openid-connect-server/src/main/webapp/WEB-INF/local-config.xml → openid-connect-server-webapp/src/main/webapp/WEB-INF/local-config.xml

2
openid-connect-server/src/main/webapp/WEB-INF/server-config.xml → openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml

@ -29,7 +29,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
<bean id="configBean" class="org.mitre.openid.connect.config.ConfigurationPropertiesBean">
<property name="issuer" value="http://localhost:8080/openid-connect-server/" />
<property name="issuer" value="http://localhost:8080/openid-connect-server-webapp/" />
<property name="logoImageUrl" value="resources/images/openid_connect_small.png" />
<property name="topbarTitle" value="OpenID Connect Server" />
</bean>

0
openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml → openid-connect-server-webapp/src/main/webapp/WEB-INF/spring-servlet.xml

0
openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/actionmenu.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/actionmenu.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/breadcrumbs.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/breadcrumbs.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/copyright.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/copyright.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/footer.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/header.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/header.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/sidebar.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/sidebar.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag

0
openid-connect-server/src/main/webapp/WEB-INF/tags/topbar.tag → openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag

0
openid-connect-server/src/main/webapp/WEB-INF/task-config.xml → openid-connect-server-webapp/src/main/webapp/WEB-INF/task-config.xml

0
openid-connect-server/src/main/webapp/WEB-INF/user-context.xml → openid-connect-server-webapp/src/main/webapp/WEB-INF/user-context.xml

0
openid-connect-server/src/main/webapp/WEB-INF/views/about.jsp → openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp

0
openid-connect-server/src/main/webapp/WEB-INF/views/approve.jsp → openid-connect-server-webapp/src/main/webapp/WEB-INF/views/approve.jsp

0
openid-connect-server/src/main/webapp/WEB-INF/views/contact.jsp → openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp

0
openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp → openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp

0
openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp → openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp

0
openid-connect-server/src/main/webapp/WEB-INF/views/manage.jsp → openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp

0
openid-connect-server/src/main/webapp/WEB-INF/views/stats.jsp → openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp

0
openid-connect-server/src/main/webapp/WEB-INF/web.xml → openid-connect-server-webapp/src/main/webapp/WEB-INF/web.xml

0
openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.css → openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.css vendored

0
openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.min.css → openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.min.css vendored

0
openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.css → openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap.css vendored

0
openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css → openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css vendored

0
openid-connect-server/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings-white.png → openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings-white.png

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

0
openid-connect-server/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings.png → openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings.png

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
openid-connect-server/src/main/webapp/resources/bootstrap2/js/bootstrap.js → openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/js/bootstrap.js vendored

0
openid-connect-server/src/main/webapp/resources/bootstrap2/js/bootstrap.min.js → openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/js/bootstrap.min.js vendored

0
openid-connect-server/src/main/webapp/resources/fonts/open_sans_400.woff → openid-connect-server-webapp/src/main/webapp/resources/fonts/open_sans_400.woff

0
openid-connect-server/src/main/webapp/resources/fonts/open_sans_700.woff → openid-connect-server-webapp/src/main/webapp/resources/fonts/open_sans_700.woff

0
openid-connect-server/src/main/webapp/resources/images/canvas.png → openid-connect-server-webapp/src/main/webapp/resources/images/canvas.png

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

0
openid-connect-server/src/main/webapp/resources/images/openid_connect_large.png → openid-connect-server-webapp/src/main/webapp/resources/images/openid_connect_large.png

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 135 KiB

0
openid-connect-server/src/main/webapp/resources/images/openid_connect_small.png → openid-connect-server-webapp/src/main/webapp/resources/images/openid_connect_small.png

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
openid-connect-server/src/main/webapp/resources/images/openid_small.png → openid-connect-server-webapp/src/main/webapp/resources/images/openid_small.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
openid-connect-server/src/main/webapp/resources/js/admin.js → openid-connect-server-webapp/src/main/webapp/resources/js/admin.js

0
openid-connect-server/src/main/webapp/resources/js/client.js → openid-connect-server-webapp/src/main/webapp/resources/js/client.js

0
openid-connect-server/src/main/webapp/resources/js/dynreg.js → openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js

0
openid-connect-server/src/main/webapp/resources/js/grant.js → openid-connect-server-webapp/src/main/webapp/resources/js/grant.js

0
openid-connect-server/src/main/webapp/resources/js/lib/backbone.js → openid-connect-server-webapp/src/main/webapp/resources/js/lib/backbone.js

0
openid-connect-server/src/main/webapp/resources/js/lib/backbone.validations.js → openid-connect-server-webapp/src/main/webapp/resources/js/lib/backbone.validations.js

0
openid-connect-server/src/main/webapp/resources/js/lib/bootstrapx-clickover.js → openid-connect-server-webapp/src/main/webapp/resources/js/lib/bootstrapx-clickover.js vendored

0
openid-connect-server/src/main/webapp/resources/js/lib/jquery.js → openid-connect-server-webapp/src/main/webapp/resources/js/lib/jquery.js vendored

0
openid-connect-server/src/main/webapp/resources/js/lib/moment.js → openid-connect-server-webapp/src/main/webapp/resources/js/lib/moment.js

0
openid-connect-server/src/main/webapp/resources/js/lib/purl.js → openid-connect-server-webapp/src/main/webapp/resources/js/lib/purl.js

0
openid-connect-server/src/main/webapp/resources/js/lib/underscore.js → openid-connect-server-webapp/src/main/webapp/resources/js/lib/underscore.js

0
openid-connect-server/src/main/webapp/resources/js/scope.js → openid-connect-server-webapp/src/main/webapp/resources/js/scope.js

0
openid-connect-server/src/main/webapp/resources/js/whitelist.js → openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js

0
openid-connect-server/src/main/webapp/resources/static_resources_go_here → openid-connect-server-webapp/src/main/webapp/resources/static_resources_go_here

0
openid-connect-server/src/main/webapp/resources/template/admin.html → openid-connect-server-webapp/src/main/webapp/resources/template/admin.html

0
openid-connect-server/src/main/webapp/resources/template/client.html → openid-connect-server-webapp/src/main/webapp/resources/template/client.html

0
openid-connect-server/src/main/webapp/resources/template/dynreg.html → openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html

0
openid-connect-server/src/main/webapp/resources/template/grant.html → openid-connect-server-webapp/src/main/webapp/resources/template/grant.html

0
openid-connect-server/src/main/webapp/resources/template/scope.html → openid-connect-server-webapp/src/main/webapp/resources/template/scope.html

0
openid-connect-server/src/main/webapp/resources/template/whitelist.html → openid-connect-server-webapp/src/main/webapp/resources/template/whitelist.html

0
openid-connect-server/src/main/webapp/resources/test/json/clients.js → openid-connect-server-webapp/src/main/webapp/resources/test/json/clients.js

51
openid-connect-server/pom.xml

@ -18,8 +18,7 @@
<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>
<artifactId>openid-connect-server</artifactId>
<name>OpenID Connect Server</name>
<packaging>war</packaging>
<name>OpenID Connect Server Library</name>
<parent>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-parent</artifactId>
@ -33,52 +32,6 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<description>Reference implementation of OpenID Connect spec (http://openid.net/connect/).
</description>
<description>OpenID Connect server libraries for Spring and Spring Security.</description>
<url />
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java-version}</source>
<target>${java-version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>openid-connect-server</warName>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>gif</nonFilteredFileExtension>
<nonFilteredFileExtension>ico</nonFilteredFileExtension>
<nonFilteredFileExtension>jpg</nonFilteredFileExtension>
<nonFilteredFileExtension>png</nonFilteredFileExtension>
<nonFilteredFileExtension>pdf</nonFilteredFileExtension>
</nonFilteredFileExtensions>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>true</filtering>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<goals>
<goal>sources</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

8
pom.xml

@ -14,8 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<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">
--><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>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-parent</artifactId>
@ -39,7 +38,8 @@
<module>openid-connect-common</module>
<module>openid-connect-client</module>
<module>openid-connect-server</module>
</modules>
<module>openid-connect-server-webapp</module>
</modules>
<scm>
<connection>scm:git:https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server.git</connection>
@ -473,4 +473,4 @@
</plugins>
</reporting>
</project>
</project>
Loading…
Cancel
Save