From 8a5a16f374163ffa1bd8ffaaabd75ed6513b7560 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Mon, 23 Sep 2013 17:19:09 -0400 Subject: [PATCH] refactored project into four modules: Common Client Server Library Server Webapp addresses #367 --- .gitignore | 2 + openid-connect-client/.gitignore | 1 + openid-connect-client/.springBeans | 14 ---- openid-connect-common/.gitignore | 2 + openid-connect-server-webapp/.gitignore | 12 ++++ openid-connect-server-webapp/pom.xml | 65 ++++++++++++++++++ .../src/main/resources/db/clients.sql | 0 .../src/main/resources/db/scopes.sql | 0 .../db/tables/hsql_database_tables.sql | 0 .../db/tables/loading_temp_tables.sql | 0 .../db/tables/mysql_database_tables.sql | 0 .../resources/db/tables/security-schema.sql | 0 .../src/main/resources/db/users.sql | 0 .../src/main/resources/keystore.jwks | 0 .../src/main/resources/log4j.xml | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../webapp/WEB-INF/application-context.xml | 0 .../src/main/webapp/WEB-INF/crypto-config.xml | 0 .../src/main/webapp/WEB-INF/data-context.xml | 0 .../src/main/webapp/WEB-INF/local-config.xml | 0 .../src/main/webapp/WEB-INF/server-config.xml | 2 +- .../main/webapp/WEB-INF/spring-servlet.xml | 0 .../main/webapp/WEB-INF/tags/aboutContent.tag | 0 .../main/webapp/WEB-INF/tags/actionmenu.tag | 0 .../main/webapp/WEB-INF/tags/breadcrumbs.tag | 0 .../webapp/WEB-INF/tags/contactContent.tag | 0 .../main/webapp/WEB-INF/tags/copyright.tag | 0 .../src/main/webapp/WEB-INF/tags/footer.tag | 0 .../src/main/webapp/WEB-INF/tags/header.tag | 0 .../webapp/WEB-INF/tags/landingPageAbout.tag | 0 .../WEB-INF/tags/landingPageContact.tag | 0 .../webapp/WEB-INF/tags/landingPageStats.tag | 0 .../WEB-INF/tags/landingPageWelcome.tag | 0 .../src/main/webapp/WEB-INF/tags/sidebar.tag | 0 .../main/webapp/WEB-INF/tags/statsContent.tag | 0 .../src/main/webapp/WEB-INF/tags/topbar.tag | 0 .../src/main/webapp/WEB-INF/task-config.xml | 0 .../src/main/webapp/WEB-INF/user-context.xml | 0 .../src/main/webapp/WEB-INF/views/about.jsp | 0 .../src/main/webapp/WEB-INF/views/approve.jsp | 0 .../src/main/webapp/WEB-INF/views/contact.jsp | 0 .../src/main/webapp/WEB-INF/views/home.jsp | 0 .../src/main/webapp/WEB-INF/views/login.jsp | 0 .../src/main/webapp/WEB-INF/views/manage.jsp | 0 .../src/main/webapp/WEB-INF/views/stats.jsp | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../bootstrap2/css/bootstrap-responsive.css | 0 .../css/bootstrap-responsive.min.css | 0 .../resources/bootstrap2/css/bootstrap.css | 0 .../bootstrap2/css/bootstrap.min.css | 0 .../img/glyphicons-halflings-white.png | Bin .../bootstrap2/img/glyphicons-halflings.png | Bin .../resources/bootstrap2/js/bootstrap.js | 0 .../resources/bootstrap2/js/bootstrap.min.js | 0 .../webapp/resources/fonts/open_sans_400.woff | Bin .../webapp/resources/fonts/open_sans_700.woff | Bin .../main/webapp/resources/images/canvas.png | Bin .../resources/images/openid_connect_large.png | Bin .../resources/images/openid_connect_small.png | Bin .../webapp/resources/images/openid_small.png | Bin .../src/main/webapp/resources/js/admin.js | 0 .../src/main/webapp/resources/js/client.js | 0 .../src/main/webapp/resources/js/dynreg.js | 0 .../src/main/webapp/resources/js/grant.js | 0 .../main/webapp/resources/js/lib/backbone.js | 0 .../resources/js/lib/backbone.validations.js | 0 .../resources/js/lib/bootstrapx-clickover.js | 0 .../main/webapp/resources/js/lib/jquery.js | 0 .../main/webapp/resources/js/lib/moment.js | 0 .../src/main/webapp/resources/js/lib/purl.js | 0 .../webapp/resources/js/lib/underscore.js | 0 .../src/main/webapp/resources/js/scope.js | 0 .../src/main/webapp/resources/js/whitelist.js | 0 .../webapp/resources/static_resources_go_here | 0 .../main/webapp/resources/template/admin.html | 0 .../webapp/resources/template/client.html | 0 .../webapp/resources/template/dynreg.html | 0 .../main/webapp/resources/template/grant.html | 0 .../main/webapp/resources/template/scope.html | 0 .../webapp/resources/template/whitelist.html | 0 .../webapp/resources/test/json/clients.js | 0 openid-connect-server/pom.xml | 51 +------------- pom.xml | 8 +-- 83 files changed, 89 insertions(+), 68 deletions(-) delete mode 100644 openid-connect-client/.springBeans create mode 100644 openid-connect-server-webapp/.gitignore create mode 100644 openid-connect-server-webapp/pom.xml rename {openid-connect-server => openid-connect-server-webapp}/src/main/resources/db/clients.sql (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/resources/db/scopes.sql (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/resources/db/tables/hsql_database_tables.sql (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/resources/db/tables/loading_temp_tables.sql (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/resources/db/tables/mysql_database_tables.sql (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/resources/db/tables/security-schema.sql (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/resources/db/users.sql (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/resources/keystore.jwks (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/resources/log4j.xml (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/application-context.xml (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/crypto-config.xml (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/data-context.xml (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/local-config.xml (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/server-config.xml (98%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/spring-servlet.xml (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/aboutContent.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/actionmenu.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/breadcrumbs.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/contactContent.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/copyright.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/footer.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/header.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/landingPageAbout.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/landingPageContact.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/landingPageStats.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/sidebar.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/statsContent.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/tags/topbar.tag (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/task-config.xml (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/user-context.xml (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/views/about.jsp (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/views/approve.jsp (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/views/contact.jsp (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/views/home.jsp (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/views/login.jsp (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/views/manage.jsp (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/views/stats.jsp (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/WEB-INF/web.xml (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.css (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.min.css (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/bootstrap2/css/bootstrap.css (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings-white.png (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings.png (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/bootstrap2/js/bootstrap.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/bootstrap2/js/bootstrap.min.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/fonts/open_sans_400.woff (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/fonts/open_sans_700.woff (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/images/canvas.png (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/images/openid_connect_large.png (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/images/openid_connect_small.png (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/images/openid_small.png (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/admin.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/client.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/dynreg.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/grant.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/lib/backbone.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/lib/backbone.validations.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/lib/bootstrapx-clickover.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/lib/jquery.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/lib/moment.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/lib/purl.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/lib/underscore.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/scope.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/js/whitelist.js (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/static_resources_go_here (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/template/admin.html (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/template/client.html (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/template/dynreg.html (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/template/grant.html (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/template/scope.html (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/template/whitelist.html (100%) rename {openid-connect-server => openid-connect-server-webapp}/src/main/webapp/resources/test/json/clients.js (100%) diff --git a/.gitignore b/.gitignore index d88f3de49..016a3b8f8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ bin .project .settings .classpath +/target +.springBeans diff --git a/openid-connect-client/.gitignore b/openid-connect-client/.gitignore index 914413074..016a3b8f8 100644 --- a/openid-connect-client/.gitignore +++ b/openid-connect-client/.gitignore @@ -9,3 +9,4 @@ bin .settings .classpath /target +.springBeans diff --git a/openid-connect-client/.springBeans b/openid-connect-client/.springBeans deleted file mode 100644 index 707e4bb7c..000000000 --- a/openid-connect-client/.springBeans +++ /dev/null @@ -1,14 +0,0 @@ - - - 1 - - - - - - - spring-servlet.xml - - - - diff --git a/openid-connect-common/.gitignore b/openid-connect-common/.gitignore index d88f3de49..016a3b8f8 100644 --- a/openid-connect-common/.gitignore +++ b/openid-connect-common/.gitignore @@ -8,3 +8,5 @@ bin .project .settings .classpath +/target +.springBeans diff --git a/openid-connect-server-webapp/.gitignore b/openid-connect-server-webapp/.gitignore new file mode 100644 index 000000000..016a3b8f8 --- /dev/null +++ b/openid-connect-server-webapp/.gitignore @@ -0,0 +1,12 @@ +local-values.conf +target +*~ +bin +*.idea +*.iml +*.eml +.project +.settings +.classpath +/target +.springBeans diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml new file mode 100644 index 000000000..f9e3fdbb8 --- /dev/null +++ b/openid-connect-server-webapp/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + org.mitre + openid-connect-parent + 1.1.0-SNAPSHOT + + openid-connect-server-webapp + war + OpenID Connect Server Webapp + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java-version} + ${java-version} + + + + org.apache.maven.plugins + maven-war-plugin + + openid-connect-server-webapp + + gif + ico + jpg + png + pdf + + + + src/main/webapp + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + install + install + + sources + + + + + + + + + org.mitre + openid-connect-server + 1.1.0-SNAPSHOT + + + diff --git a/openid-connect-server/src/main/resources/db/clients.sql b/openid-connect-server-webapp/src/main/resources/db/clients.sql similarity index 100% rename from openid-connect-server/src/main/resources/db/clients.sql rename to openid-connect-server-webapp/src/main/resources/db/clients.sql diff --git a/openid-connect-server/src/main/resources/db/scopes.sql b/openid-connect-server-webapp/src/main/resources/db/scopes.sql similarity index 100% rename from openid-connect-server/src/main/resources/db/scopes.sql rename to openid-connect-server-webapp/src/main/resources/db/scopes.sql diff --git a/openid-connect-server/src/main/resources/db/tables/hsql_database_tables.sql b/openid-connect-server-webapp/src/main/resources/db/tables/hsql_database_tables.sql similarity index 100% rename from openid-connect-server/src/main/resources/db/tables/hsql_database_tables.sql rename to openid-connect-server-webapp/src/main/resources/db/tables/hsql_database_tables.sql diff --git a/openid-connect-server/src/main/resources/db/tables/loading_temp_tables.sql b/openid-connect-server-webapp/src/main/resources/db/tables/loading_temp_tables.sql similarity index 100% rename from openid-connect-server/src/main/resources/db/tables/loading_temp_tables.sql rename to openid-connect-server-webapp/src/main/resources/db/tables/loading_temp_tables.sql diff --git a/openid-connect-server/src/main/resources/db/tables/mysql_database_tables.sql b/openid-connect-server-webapp/src/main/resources/db/tables/mysql_database_tables.sql similarity index 100% rename from openid-connect-server/src/main/resources/db/tables/mysql_database_tables.sql rename to openid-connect-server-webapp/src/main/resources/db/tables/mysql_database_tables.sql diff --git a/openid-connect-server/src/main/resources/db/tables/security-schema.sql b/openid-connect-server-webapp/src/main/resources/db/tables/security-schema.sql similarity index 100% rename from openid-connect-server/src/main/resources/db/tables/security-schema.sql rename to openid-connect-server-webapp/src/main/resources/db/tables/security-schema.sql diff --git a/openid-connect-server/src/main/resources/db/users.sql b/openid-connect-server-webapp/src/main/resources/db/users.sql similarity index 100% rename from openid-connect-server/src/main/resources/db/users.sql rename to openid-connect-server-webapp/src/main/resources/db/users.sql diff --git a/openid-connect-server/src/main/resources/keystore.jwks b/openid-connect-server-webapp/src/main/resources/keystore.jwks similarity index 100% rename from openid-connect-server/src/main/resources/keystore.jwks rename to openid-connect-server-webapp/src/main/resources/keystore.jwks diff --git a/openid-connect-server/src/main/resources/log4j.xml b/openid-connect-server-webapp/src/main/resources/log4j.xml similarity index 100% rename from openid-connect-server/src/main/resources/log4j.xml rename to openid-connect-server-webapp/src/main/resources/log4j.xml diff --git a/openid-connect-server/src/main/webapp/META-INF/MANIFEST.MF b/openid-connect-server-webapp/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from openid-connect-server/src/main/webapp/META-INF/MANIFEST.MF rename to openid-connect-server-webapp/src/main/webapp/META-INF/MANIFEST.MF diff --git a/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/application-context.xml rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml diff --git a/openid-connect-server/src/main/webapp/WEB-INF/crypto-config.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/crypto-config.xml similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/crypto-config.xml rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/crypto-config.xml diff --git a/openid-connect-server/src/main/webapp/WEB-INF/data-context.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/data-context.xml rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml diff --git a/openid-connect-server/src/main/webapp/WEB-INF/local-config.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/local-config.xml similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/local-config.xml rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/local-config.xml diff --git a/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml similarity index 98% rename from openid-connect-server/src/main/webapp/WEB-INF/server-config.xml rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml index 1ef83e577..7fe4f6f2c 100644 --- a/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml +++ b/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"> - + diff --git a/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/spring-servlet.xml similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/spring-servlet.xml diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/actionmenu.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/actionmenu.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/actionmenu.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/actionmenu.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/breadcrumbs.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/breadcrumbs.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/breadcrumbs.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/breadcrumbs.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/copyright.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/copyright.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/copyright.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/copyright.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/footer.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/footer.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/header.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/header.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/header.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/header.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/sidebar.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/sidebar.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/sidebar.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/sidebar.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/topbar.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/topbar.tag rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/task-config.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/task-config.xml similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/task-config.xml rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/task-config.xml diff --git a/openid-connect-server/src/main/webapp/WEB-INF/user-context.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/user-context.xml similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/user-context.xml rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/user-context.xml diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/about.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/views/about.jsp rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/approve.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/approve.jsp similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/views/approve.jsp rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/views/approve.jsp diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/contact.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/views/contact.jsp rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/manage.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/views/manage.jsp rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/stats.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/views/stats.jsp rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp diff --git a/openid-connect-server/src/main/webapp/WEB-INF/web.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/web.xml rename to openid-connect-server-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.css b/openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.css similarity index 100% rename from openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.css rename to openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.css diff --git a/openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.min.css b/openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.min.css similarity index 100% rename from openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.min.css rename to openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap-responsive.min.css diff --git a/openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.css b/openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap.css similarity index 100% rename from openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.css rename to openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap.css diff --git a/openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css b/openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css similarity index 100% rename from openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css rename to openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css diff --git a/openid-connect-server/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings-white.png b/openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings-white.png similarity index 100% rename from openid-connect-server/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings-white.png rename to openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings-white.png diff --git a/openid-connect-server/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings.png b/openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings.png similarity index 100% rename from openid-connect-server/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings.png rename to openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/img/glyphicons-halflings.png diff --git a/openid-connect-server/src/main/webapp/resources/bootstrap2/js/bootstrap.js b/openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/js/bootstrap.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/bootstrap2/js/bootstrap.js rename to openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/js/bootstrap.js diff --git a/openid-connect-server/src/main/webapp/resources/bootstrap2/js/bootstrap.min.js b/openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/js/bootstrap.min.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/bootstrap2/js/bootstrap.min.js rename to openid-connect-server-webapp/src/main/webapp/resources/bootstrap2/js/bootstrap.min.js diff --git a/openid-connect-server/src/main/webapp/resources/fonts/open_sans_400.woff b/openid-connect-server-webapp/src/main/webapp/resources/fonts/open_sans_400.woff similarity index 100% rename from openid-connect-server/src/main/webapp/resources/fonts/open_sans_400.woff rename to openid-connect-server-webapp/src/main/webapp/resources/fonts/open_sans_400.woff diff --git a/openid-connect-server/src/main/webapp/resources/fonts/open_sans_700.woff b/openid-connect-server-webapp/src/main/webapp/resources/fonts/open_sans_700.woff similarity index 100% rename from openid-connect-server/src/main/webapp/resources/fonts/open_sans_700.woff rename to openid-connect-server-webapp/src/main/webapp/resources/fonts/open_sans_700.woff diff --git a/openid-connect-server/src/main/webapp/resources/images/canvas.png b/openid-connect-server-webapp/src/main/webapp/resources/images/canvas.png similarity index 100% rename from openid-connect-server/src/main/webapp/resources/images/canvas.png rename to openid-connect-server-webapp/src/main/webapp/resources/images/canvas.png diff --git a/openid-connect-server/src/main/webapp/resources/images/openid_connect_large.png b/openid-connect-server-webapp/src/main/webapp/resources/images/openid_connect_large.png similarity index 100% rename from openid-connect-server/src/main/webapp/resources/images/openid_connect_large.png rename to openid-connect-server-webapp/src/main/webapp/resources/images/openid_connect_large.png diff --git a/openid-connect-server/src/main/webapp/resources/images/openid_connect_small.png b/openid-connect-server-webapp/src/main/webapp/resources/images/openid_connect_small.png similarity index 100% rename from openid-connect-server/src/main/webapp/resources/images/openid_connect_small.png rename to openid-connect-server-webapp/src/main/webapp/resources/images/openid_connect_small.png diff --git a/openid-connect-server/src/main/webapp/resources/images/openid_small.png b/openid-connect-server-webapp/src/main/webapp/resources/images/openid_small.png similarity index 100% rename from openid-connect-server/src/main/webapp/resources/images/openid_small.png rename to openid-connect-server-webapp/src/main/webapp/resources/images/openid_small.png diff --git a/openid-connect-server/src/main/webapp/resources/js/admin.js b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/admin.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/admin.js diff --git a/openid-connect-server/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/client.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/client.js diff --git a/openid-connect-server/src/main/webapp/resources/js/dynreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/dynreg.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js diff --git a/openid-connect-server/src/main/webapp/resources/js/grant.js b/openid-connect-server-webapp/src/main/webapp/resources/js/grant.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/grant.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/grant.js diff --git a/openid-connect-server/src/main/webapp/resources/js/lib/backbone.js b/openid-connect-server-webapp/src/main/webapp/resources/js/lib/backbone.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/lib/backbone.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/lib/backbone.js diff --git a/openid-connect-server/src/main/webapp/resources/js/lib/backbone.validations.js b/openid-connect-server-webapp/src/main/webapp/resources/js/lib/backbone.validations.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/lib/backbone.validations.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/lib/backbone.validations.js diff --git a/openid-connect-server/src/main/webapp/resources/js/lib/bootstrapx-clickover.js b/openid-connect-server-webapp/src/main/webapp/resources/js/lib/bootstrapx-clickover.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/lib/bootstrapx-clickover.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/lib/bootstrapx-clickover.js diff --git a/openid-connect-server/src/main/webapp/resources/js/lib/jquery.js b/openid-connect-server-webapp/src/main/webapp/resources/js/lib/jquery.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/lib/jquery.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/lib/jquery.js diff --git a/openid-connect-server/src/main/webapp/resources/js/lib/moment.js b/openid-connect-server-webapp/src/main/webapp/resources/js/lib/moment.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/lib/moment.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/lib/moment.js diff --git a/openid-connect-server/src/main/webapp/resources/js/lib/purl.js b/openid-connect-server-webapp/src/main/webapp/resources/js/lib/purl.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/lib/purl.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/lib/purl.js diff --git a/openid-connect-server/src/main/webapp/resources/js/lib/underscore.js b/openid-connect-server-webapp/src/main/webapp/resources/js/lib/underscore.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/lib/underscore.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/lib/underscore.js diff --git a/openid-connect-server/src/main/webapp/resources/js/scope.js b/openid-connect-server-webapp/src/main/webapp/resources/js/scope.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/scope.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/scope.js diff --git a/openid-connect-server/src/main/webapp/resources/js/whitelist.js b/openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/js/whitelist.js rename to openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js diff --git a/openid-connect-server/src/main/webapp/resources/static_resources_go_here b/openid-connect-server-webapp/src/main/webapp/resources/static_resources_go_here similarity index 100% rename from openid-connect-server/src/main/webapp/resources/static_resources_go_here rename to openid-connect-server-webapp/src/main/webapp/resources/static_resources_go_here diff --git a/openid-connect-server/src/main/webapp/resources/template/admin.html b/openid-connect-server-webapp/src/main/webapp/resources/template/admin.html similarity index 100% rename from openid-connect-server/src/main/webapp/resources/template/admin.html rename to openid-connect-server-webapp/src/main/webapp/resources/template/admin.html diff --git a/openid-connect-server/src/main/webapp/resources/template/client.html b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html similarity index 100% rename from openid-connect-server/src/main/webapp/resources/template/client.html rename to openid-connect-server-webapp/src/main/webapp/resources/template/client.html diff --git a/openid-connect-server/src/main/webapp/resources/template/dynreg.html b/openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html similarity index 100% rename from openid-connect-server/src/main/webapp/resources/template/dynreg.html rename to openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html diff --git a/openid-connect-server/src/main/webapp/resources/template/grant.html b/openid-connect-server-webapp/src/main/webapp/resources/template/grant.html similarity index 100% rename from openid-connect-server/src/main/webapp/resources/template/grant.html rename to openid-connect-server-webapp/src/main/webapp/resources/template/grant.html diff --git a/openid-connect-server/src/main/webapp/resources/template/scope.html b/openid-connect-server-webapp/src/main/webapp/resources/template/scope.html similarity index 100% rename from openid-connect-server/src/main/webapp/resources/template/scope.html rename to openid-connect-server-webapp/src/main/webapp/resources/template/scope.html diff --git a/openid-connect-server/src/main/webapp/resources/template/whitelist.html b/openid-connect-server-webapp/src/main/webapp/resources/template/whitelist.html similarity index 100% rename from openid-connect-server/src/main/webapp/resources/template/whitelist.html rename to openid-connect-server-webapp/src/main/webapp/resources/template/whitelist.html diff --git a/openid-connect-server/src/main/webapp/resources/test/json/clients.js b/openid-connect-server-webapp/src/main/webapp/resources/test/json/clients.js similarity index 100% rename from openid-connect-server/src/main/webapp/resources/test/json/clients.js rename to openid-connect-server-webapp/src/main/webapp/resources/test/json/clients.js diff --git a/openid-connect-server/pom.xml b/openid-connect-server/pom.xml index b87d964d3..d2fc8b3a5 100644 --- a/openid-connect-server/pom.xml +++ b/openid-connect-server/pom.xml @@ -18,8 +18,7 @@ 4.0.0 openid-connect-server - OpenID Connect Server - war + OpenID Connect Server Library org.mitre openid-connect-parent @@ -33,52 +32,6 @@ 1.1.0-SNAPSHOT - Reference implementation of OpenID Connect spec (http://openid.net/connect/). - + OpenID Connect server libraries for Spring and Spring Security. - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java-version} - ${java-version} - - - - org.apache.maven.plugins - maven-war-plugin - - openid-connect-server - - gif - ico - jpg - png - pdf - - - - src/main/webapp - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - sources - - - - - - diff --git a/pom.xml b/pom.xml index 7ba1b581f..6bda5f5f6 100644 --- a/pom.xml +++ b/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. ---> - +--> 4.0.0 org.mitre openid-connect-parent @@ -39,7 +38,8 @@ openid-connect-common openid-connect-client openid-connect-server - + openid-connect-server-webapp + scm:git:https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server.git @@ -473,4 +473,4 @@ - + \ No newline at end of file