JAVA-1132: Changes to main pom and README to accomodate module movements

README.md

@@ -16,21 +16,21 @@ mvn clean install
 
 ## Projects/Modules
 This project contains a number of modules, but here are the main ones you should focus on and run: 
-- `oauth-authorization-server` - the Keycloak based Authorization Server (port = 8083)
-- `oauth-resource-server` - the Resource Server based on new stack (port = 8081)
-- `oauth-authorization-server-legacy` - the Spring based Authorization Server (port = 8081)
-- `oauth-resource-server-legacy-1` - the Resource Server based on old stack (port = 8082)
-- `oauth-resource-server-legacy-2` - the secondary Resource Server based on old stack (port = 8088)
+- `oauth-new/oauth-authorization-server` - the Keycloak based Authorization Server (port = 8083)
+- `oauth-new/oauth-resource-server` - the Resource Server based on new stack (port = 8081)
+- `oauth-legacy/oauth-authorization-server-legacy` - the Spring based Authorization Server (port = 8081)
+- `oauth-legacy/oauth-resource-server-legacy-1` - the Resource Server based on old stack (port = 8082)
+- `oauth-legacy/oauth-resource-server-legacy-2` - the secondary Resource Server based on old stack (port = 8088)
 
 And, depending on what grant type you want to try out, you'll work with one of these UI/Clients:  
 - `angularjs/oauth-ui-implicit` (port = 8083)
-- `angularjs/oauth-ui-password` (port = 8084)
+- `angularjs/oauth-ui-password-legacy` (port = 8084)
 
 Other Modules: 
-- `clients-angular/oauth-ui-authorization-code-angular` - Authorization Code Grant UI Module - using Angular 7, hitting the new resource server
-- `clients-angular/oauth-ui-authorization-code-angular-legacy` - Authorization Code Grant UI Module - using Angular 7, hitting the old resource server
-- `clients-angular/oauth-ui-implicit-angular-legacy` - another version of the Implicit Grant UI Module - using Angular 7, hitting the old resource server
-- `clients-angular/oauth-ui-password-angular-legacy` - another version of the Password Grant UI Module - using Angular 7, hitting the old resource server
+- `oauth-new/oauth-ui-authorization-code-angular` - Authorization Code Grant UI Module - using Angular 7, hitting the new resource server
+- `oauth-legacy/oauth-ui-authorization-code-angular-legacy` - Authorization Code Grant UI Module - using Angular 7, hitting the old resource server
+- `oauth-legacy/oauth-ui-implicit-angular-legacy` - another version of the Implicit Grant UI Module - using Angular 7, hitting the old resource server
+- `oauth-legacy/oauth-ui-password-angular-legacy` - another version of the Password Grant UI Module - using Angular 7, hitting the old resource server
 
 Finally, you can ignore all other modules. 
 

pom.xml

@@ -77,9 +77,10 @@
 
 
 	<modules>
-		<module>oauth-resource-server-legacy-2</module>
-		<module>oauth-resource-server-legacy-1</module>
-		<module>oauth-resource-server</module>
+		<module>oauth-legacy/oauth-resource-server-legacy-2</module>
+		<module>oauth-legacy/oauth-resource-server-legacy-1</module>
+		<module>oauth-new/oauth-resource-server</module>
+		<module>oauth-jwt/jwt-resource-server</module>
 
 		<module>clients-angularjs/oauth-ui-implicit</module>
 		<module>clients-angularjs/oauth-ui-password</module>
@@ -88,8 +89,9 @@
         <module>clients-SPA/clients-js-only-react</module>
         <module>clients-SPA/oauth-resource-server-auth0</module>
 
-		<module>oauth-authorization-server</module>
-		<module>oauth-authorization-server-legacy</module>
+		<module>oauth-new/oauth-authorization-server</module>
+		<module>oauth-legacy/oauth-authorization-server-legacy</module>
+		<module>oauth-jwt/jwt-auth-server</module>
         <module>oauth-zuul-gateway</module>
 
 		<module>oauth-jws-jwk\oauth-authorization-server-jws-jwk</module>