Moving all the oauth demos into oauth-examples folder

git-svn-id: file:///Users/billburke/jboss/resteasy/resteasy-git/svn-server-sync/resteasy/trunk@1231 2b1ed4c4-5db3-0410-90e4-80a7a6204c25
resteasy · Sep 16, 2010 · 399c328 · 399c328
1 parent d225b62
commit 399c328
Show file tree

Hide file tree

Showing 75 changed files with 40 additions and 12 deletions.
diff --git a/...oauth-authenticator/authenticator/pom.xml → ...alina-authenticator/authenticator/pom.xml b/...oauth-authenticator/authenticator/pom.xml → ...alina-authenticator/authenticator/pom.xml
diff --git a/...uthenticator/OAuthBasicAuthenticator.java → ...uthenticator/OAuthBasicAuthenticator.java b/...uthenticator/OAuthBasicAuthenticator.java → ...uthenticator/OAuthBasicAuthenticator.java
diff --git a/.../oauth/authenticator/OAuthDBProvider.java → .../oauth/authenticator/OAuthDBProvider.java b/.../oauth/authenticator/OAuthDBProvider.java → .../oauth/authenticator/OAuthDBProvider.java
diff --git a/...nticator/src/main/resources/db.properties → ...nticator/src/main/resources/db.properties b/...nticator/src/main/resources/db.properties → ...nticator/src/main/resources/db.properties
diff --git a/...icator/oauth/OAuthBasicAuthenticator.java → ...icator/oauth/OAuthBasicAuthenticator.java b/...icator/oauth/OAuthBasicAuthenticator.java → ...icator/oauth/OAuthBasicAuthenticator.java
diff --git a/...ples/oauth-authenticator/oauth/README.TXT → ...h-catalina-authenticator/oauth/README.TXT b/...ples/oauth-authenticator/oauth/README.TXT → ...h-catalina-authenticator/oauth/README.TXT
diff --git a/...xamples/oauth-authenticator/oauth/pom.xml → ...auth-catalina-authenticator/oauth/pom.xml b/...xamples/oauth-authenticator/oauth/pom.xml → ...auth-catalina-authenticator/oauth/pom.xml
diff --git a/...easy/examples/oauth/ConsumerResource.java → ...easy/examples/oauth/ConsumerResource.java b/...easy/examples/oauth/ConsumerResource.java → ...easy/examples/oauth/ConsumerResource.java
diff --git a/...boss/resteasy/examples/oauth/EndUser.java → ...boss/resteasy/examples/oauth/EndUser.java b/...boss/resteasy/examples/oauth/EndUser.java → ...boss/resteasy/examples/oauth/EndUser.java
diff --git a/...easy/examples/oauth/OAuthApplication.java → ...easy/examples/oauth/OAuthApplication.java b/...easy/examples/oauth/OAuthApplication.java → ...easy/examples/oauth/OAuthApplication.java
diff --git a/...amples/oauth/ServiceProviderResource.java → ...amples/oauth/ServiceProviderResource.java b/...amples/oauth/ServiceProviderResource.java → ...amples/oauth/ServiceProviderResource.java
diff --git a/...or/oauth/src/main/resources/db.properties → ...or/oauth/src/main/resources/db.properties b/...or/oauth/src/main/resources/db.properties → ...or/oauth/src/main/resources/db.properties
diff --git a/...oauth/src/main/resources/oauth.properties → ...oauth/src/main/resources/oauth.properties b/...oauth/src/main/resources/oauth.properties → ...oauth/src/main/resources/oauth.properties
diff --git a/...oauth/src/main/webapp/WEB-INF/context.xml → ...oauth/src/main/webapp/WEB-INF/context.xml b/...oauth/src/main/webapp/WEB-INF/context.xml → ...oauth/src/main/webapp/WEB-INF/context.xml
diff --git a/...uth/src/main/webapp/WEB-INF/jboss-web.xml → ...uth/src/main/webapp/WEB-INF/jboss-web.xml b/...uth/src/main/webapp/WEB-INF/jboss-web.xml → ...uth/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/...tor/oauth/src/main/webapp/WEB-INF/web.xml → ...tor/oauth/src/main/webapp/WEB-INF/web.xml b/...tor/oauth/src/main/webapp/WEB-INF/web.xml → ...tor/oauth/src/main/webapp/WEB-INF/web.xml
diff --git a/...h/src/main/webapp/token_authorization.jsp → ...h/src/main/webapp/token_authorization.jsp b/...h/src/main/webapp/token_authorization.jsp → ...h/src/main/webapp/token_authorization.jsp
diff --git a/jaxrs/examples/oauth-authenticator/pom.xml → ...ples/oauth-catalina-authenticator/pom.xml b/jaxrs/examples/oauth-authenticator/pom.xml → ...ples/oauth-catalina-authenticator/pom.xml
@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.resteasy</groupId>
-    <artifactId>oauth-examples-pom</artifactId>
+    <artifactId>oauth-examples-authenticator-pom</artifactId>
     <packaging>pom</packaging>
 
     <build>

diff --git a/...s/oauth-push-messaging-sso/openid/pom.xml → ...auth-push-messaging-openid/openid/pom.xml b/...s/oauth-push-messaging-sso/openid/pom.xml → ...auth-push-messaging-openid/openid/pom.xml
@@ -4,7 +4,7 @@
          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.jboss.resteasy.examples</groupId>
-    <artifactId>examples-oauth-push-messaging-openid</artifactId>
+    <artifactId>examples-oauth-push-messaging-openid-provider</artifactId>
     <version>2.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example: OAuth Push Messaging OpenId Provider</name>

diff --git a/...easy/examples/openid/ProviderServlet.java → ...easy/examples/openid/ProviderServlet.java b/...easy/examples/openid/ProviderServlet.java → ...easy/examples/openid/ProviderServlet.java
diff --git a/...rc/main/resources/discovery/discovery.xml → ...rc/main/resources/discovery/discovery.xml b/...rc/main/resources/discovery/discovery.xml → ...rc/main/resources/discovery/discovery.xml
diff --git a/...penid/src/main/resources/log4j.properties → ...penid/src/main/resources/log4j.properties b/...penid/src/main/resources/log4j.properties → ...penid/src/main/resources/log4j.properties
diff --git a/...enid/src/main/resources/openid.properties → ...enid/src/main/resources/openid.properties b/...enid/src/main/resources/openid.properties → ...enid/src/main/resources/openid.properties
diff --git a/...nid/src/main/webapp/WEB-INF/jboss-web.xml → ...nid/src/main/webapp/WEB-INF/jboss-web.xml b/...nid/src/main/webapp/WEB-INF/jboss-web.xml → ...nid/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/...so/openid/src/main/webapp/WEB-INF/web.xml → ...id/openid/src/main/webapp/WEB-INF/web.xml b/...so/openid/src/main/webapp/WEB-INF/web.xml → ...id/openid/src/main/webapp/WEB-INF/web.xml
diff --git a/...src/test/resources/jetty-realm.properties → ...src/test/resources/jetty-realm.properties b/...src/test/resources/jetty-realm.properties → ...src/test/resources/jetty-realm.properties
diff --git a/...examples/oauth-push-messaging-sso/pom.xml → ...mples/oauth-push-messaging-openid/pom.xml b/...examples/oauth-push-messaging-sso/pom.xml → ...mples/oauth-push-messaging-openid/pom.xml
@@ -4,11 +4,11 @@
         <artifactId>resteasy-jaxrs-all</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
-    <name>Example: OAuth Push Messaging SSO Modules</name>
+    <name>Example: OAuth Push Messaging OpenId Modules</name>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.resteasy</groupId>
-    <artifactId>examples-oauth-push-messaging-sso-all</artifactId>
+    <artifactId>examples-oauth-push-messaging-openid-all</artifactId>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/...h-messaging-sso/push-messaging/README.TXT → ...essaging-openid/push-messaging/README.TXT b/...h-messaging-sso/push-messaging/README.TXT → ...essaging-openid/push-messaging/README.TXT
diff --git a/...push-messaging-sso/push-messaging/pom.xml → ...h-messaging-openid/push-messaging/pom.xml b/...push-messaging-sso/push-messaging/pom.xml → ...h-messaging-openid/push-messaging/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>examples-oauth-push-messaging-sso</artifactId>
     <version>2.1-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>Example: OAuth Push Messaging Single SignOn</name>
+    <name>Example: OAuth Push Messaging SSO</name>
     <description/>
 
     <properties>

diff --git a/...teasy/examples/oauth/MessageReceiver.java → ...teasy/examples/oauth/MessageReceiver.java b/...teasy/examples/oauth/MessageReceiver.java → ...teasy/examples/oauth/MessageReceiver.java
diff --git a/...esteasy/examples/oauth/MessageSender.java → ...esteasy/examples/oauth/MessageSender.java b/...esteasy/examples/oauth/MessageSender.java → ...esteasy/examples/oauth/MessageSender.java
diff --git a/...easy/examples/oauth/MessagingService.java → ...easy/examples/oauth/MessagingService.java b/...easy/examples/oauth/MessagingService.java → ...easy/examples/oauth/MessagingService.java
diff --git a/...easy/examples/oauth/OAuthApplication.java → ...easy/examples/oauth/OAuthApplication.java b/...easy/examples/oauth/OAuthApplication.java → ...easy/examples/oauth/OAuthApplication.java
diff --git a/...sy/examples/oauth/OAuthMessageSender.java → ...sy/examples/oauth/OAuthMessageSender.java b/...sy/examples/oauth/OAuthMessageSender.java → ...sy/examples/oauth/OAuthMessageSender.java
diff --git a/...mples/oauth/OAuthPushMessagingFilter.java → ...mples/oauth/OAuthPushMessagingFilter.java b/...mples/oauth/OAuthPushMessagingFilter.java → ...mples/oauth/OAuthPushMessagingFilter.java
diff --git a/...les/oauth/OAuthPushMessagingProvider.java → ...les/oauth/OAuthPushMessagingProvider.java b/...les/oauth/OAuthPushMessagingProvider.java → ...les/oauth/OAuthPushMessagingProvider.java
diff --git a/...resteasy/examples/oauth/OpenIdFilter.java → ...resteasy/examples/oauth/OpenIdFilter.java b/...resteasy/examples/oauth/OpenIdFilter.java → ...resteasy/examples/oauth/OpenIdFilter.java
diff --git a/...s/resteasy/examples/oauth/Subscriber.java → ...s/resteasy/examples/oauth/Subscriber.java b/...s/resteasy/examples/oauth/Subscriber.java → ...s/resteasy/examples/oauth/Subscriber.java
diff --git a/...essaging/src/main/resources/db.properties → ...essaging/src/main/resources/db.properties b/...essaging/src/main/resources/db.properties → ...essaging/src/main/resources/db.properties
diff --git a/...aging/src/main/resources/oauth.properties → ...aging/src/main/resources/oauth.properties b/...aging/src/main/resources/oauth.properties → ...aging/src/main/resources/oauth.properties
diff --git a/...messaging/src/main/webapp/WEB-INF/web.xml → ...messaging/src/main/webapp/WEB-INF/web.xml b/...messaging/src/main/webapp/WEB-INF/web.xml → ...messaging/src/main/webapp/WEB-INF/web.xml
diff --git a/.../examples/oauth-push-messaging/README.TXT → ...-examples/oauth-push-messaging/README.TXT b/.../examples/oauth-push-messaging/README.TXT → ...-examples/oauth-push-messaging/README.TXT
diff --git a/jaxrs/examples/oauth-push-messaging/pom.xml → ...uth-examples/oauth-push-messaging/pom.xml b/jaxrs/examples/oauth-push-messaging/pom.xml → ...uth-examples/oauth-push-messaging/pom.xml
diff --git a/...teasy/examples/oauth/MessageReceiver.java → ...teasy/examples/oauth/MessageReceiver.java b/...teasy/examples/oauth/MessageReceiver.java → ...teasy/examples/oauth/MessageReceiver.java
diff --git a/...esteasy/examples/oauth/MessageSender.java → ...esteasy/examples/oauth/MessageSender.java b/...esteasy/examples/oauth/MessageSender.java → ...esteasy/examples/oauth/MessageSender.java
diff --git a/...easy/examples/oauth/MessagingService.java → ...easy/examples/oauth/MessagingService.java b/...easy/examples/oauth/MessagingService.java → ...easy/examples/oauth/MessagingService.java
diff --git a/...easy/examples/oauth/OAuthApplication.java → ...easy/examples/oauth/OAuthApplication.java b/...easy/examples/oauth/OAuthApplication.java → ...easy/examples/oauth/OAuthApplication.java
diff --git a/...ples/oauth/OAuthAuthenticationFilter.java → ...ples/oauth/OAuthAuthenticationFilter.java b/...ples/oauth/OAuthAuthenticationFilter.java → ...ples/oauth/OAuthAuthenticationFilter.java
diff --git a/...sy/examples/oauth/OAuthMessageSender.java → ...sy/examples/oauth/OAuthMessageSender.java b/...sy/examples/oauth/OAuthMessageSender.java → ...sy/examples/oauth/OAuthMessageSender.java
diff --git a/...mples/oauth/OAuthPushMessagingFilter.java → ...mples/oauth/OAuthPushMessagingFilter.java b/...mples/oauth/OAuthPushMessagingFilter.java → ...mples/oauth/OAuthPushMessagingFilter.java
diff --git a/...les/oauth/OAuthPushMessagingProvider.java → ...les/oauth/OAuthPushMessagingProvider.java b/...les/oauth/OAuthPushMessagingProvider.java → ...les/oauth/OAuthPushMessagingProvider.java
diff --git a/...s/resteasy/examples/oauth/Subscriber.java → ...s/resteasy/examples/oauth/Subscriber.java b/...s/resteasy/examples/oauth/Subscriber.java → ...s/resteasy/examples/oauth/Subscriber.java
diff --git a/...sy/examples/oauth/SubscriberReceiver.java → ...sy/examples/oauth/SubscriberReceiver.java b/...sy/examples/oauth/SubscriberReceiver.java → ...sy/examples/oauth/SubscriberReceiver.java
diff --git a/...essaging/src/main/resources/db.properties → ...essaging/src/main/resources/db.properties b/...essaging/src/main/resources/db.properties → ...essaging/src/main/resources/db.properties
diff --git a/...aging/src/main/resources/oauth.properties → ...aging/src/main/resources/oauth.properties b/...aging/src/main/resources/oauth.properties → ...aging/src/main/resources/oauth.properties
diff --git a/...ing/src/main/webapp/WEB-INF/jboss-web.xml → ...ing/src/main/webapp/WEB-INF/jboss-web.xml b/...ing/src/main/webapp/WEB-INF/jboss-web.xml → ...ing/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/...messaging/src/main/webapp/WEB-INF/web.xml → ...messaging/src/main/webapp/WEB-INF/web.xml b/...messaging/src/main/webapp/WEB-INF/web.xml → ...messaging/src/main/webapp/WEB-INF/web.xml
diff --git a/...src/test/resources/jetty-realm.properties → ...src/test/resources/jetty-realm.properties b/...src/test/resources/jetty-realm.properties → ...src/test/resources/jetty-realm.properties
diff --git a/jaxrs/examples/oauth/README.TXT → .../examples/oauth-examples/oauth/README.TXT b/jaxrs/examples/oauth/README.TXT → .../examples/oauth-examples/oauth/README.TXT
diff --git a/jaxrs/examples/oauth/pom.xml → jaxrs/examples/oauth-examples/oauth/pom.xml b/jaxrs/examples/oauth/pom.xml → jaxrs/examples/oauth-examples/oauth/pom.xml
diff --git a/...easy/examples/oauth/ConsumerResource.java → ...easy/examples/oauth/ConsumerResource.java b/...easy/examples/oauth/ConsumerResource.java → ...easy/examples/oauth/ConsumerResource.java
diff --git a/...boss/resteasy/examples/oauth/EndUser.java → ...boss/resteasy/examples/oauth/EndUser.java b/...boss/resteasy/examples/oauth/EndUser.java → ...boss/resteasy/examples/oauth/EndUser.java
diff --git a/...easy/examples/oauth/OAuthApplication.java → ...easy/examples/oauth/OAuthApplication.java b/...easy/examples/oauth/OAuthApplication.java → ...easy/examples/oauth/OAuthApplication.java
diff --git a/...oauth/OAuthBasicAuthenticationFilter.java → ...oauth/OAuthBasicAuthenticationFilter.java b/...oauth/OAuthBasicAuthenticationFilter.java → ...oauth/OAuthBasicAuthenticationFilter.java
diff --git a/...esteasy/examples/oauth/OAuthDBFilter.java → ...esteasy/examples/oauth/OAuthDBFilter.java b/...esteasy/examples/oauth/OAuthDBFilter.java → ...esteasy/examples/oauth/OAuthDBFilter.java
diff --git a/...teasy/examples/oauth/OAuthDBProvider.java → ...teasy/examples/oauth/OAuthDBProvider.java b/...teasy/examples/oauth/OAuthDBProvider.java → ...teasy/examples/oauth/OAuthDBProvider.java
diff --git a/...amples/oauth/ServiceProviderResource.java → ...amples/oauth/ServiceProviderResource.java b/...amples/oauth/ServiceProviderResource.java → ...amples/oauth/ServiceProviderResource.java
diff --git a/...es/oauth/src/main/resources/db.properties → ...es/oauth/src/main/resources/db.properties b/...es/oauth/src/main/resources/db.properties → ...es/oauth/src/main/resources/db.properties
diff --git a/...oauth/src/main/resources/oauth.properties → ...oauth/src/main/resources/oauth.properties b/...oauth/src/main/resources/oauth.properties → ...oauth/src/main/resources/oauth.properties
diff --git a/...uth/src/main/webapp/WEB-INF/jboss-web.xml → ...uth/src/main/webapp/WEB-INF/jboss-web.xml b/...uth/src/main/webapp/WEB-INF/jboss-web.xml → ...uth/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/...les/oauth/src/main/webapp/WEB-INF/web.xml → ...les/oauth/src/main/webapp/WEB-INF/web.xml b/...les/oauth/src/main/webapp/WEB-INF/web.xml → ...les/oauth/src/main/webapp/WEB-INF/web.xml
@@ -29,10 +29,9 @@
     <filter>
 		<filter-name>OAuth Filter</filter-name>
 		<!-- Enable this filter when deploying to JBoss only -->
-		<!-- 
+                <!-- 
 		<filter-class>org.jboss.resteasy.examples.oauth.OAuthBasicAuthenticationFilter</filter-class>
-		-->
-
+                -->
 		<filter-class>org.jboss.resteasy.examples.oauth.OAuthDBFilter</filter-class>
 
 	</filter>

diff --git a/...h/src/main/webapp/token_authorization.jsp → ...h/src/main/webapp/token_authorization.jsp b/...h/src/main/webapp/token_authorization.jsp → ...h/src/main/webapp/token_authorization.jsp
diff --git a/...src/test/resources/jetty-realm.properties → ...src/test/resources/jetty-realm.properties b/...src/test/resources/jetty-realm.properties → ...src/test/resources/jetty-realm.properties
diff --git a/jaxrs/examples/oauth-examples/pom.xml b/jaxrs/examples/oauth-examples/pom.xml
@@ -0,0 +1,32 @@
+<project>
+    <parent>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-jaxrs-all</artifactId>
+        <version>2.1-SNAPSHOT</version>
+    </parent>
+    <name>OAuth Examples</name>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.jboss.resteasy</groupId>
+    <artifactId>oauth-examples-pom</artifactId>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <modules>
+        <module>oauth</module>
+        <module>oauth-push-messaging</module>
+        <module>oauth-push-messaging-openid</module>
+        <module>oauth-catalina-authenticator</module>
+    </modules>
+</project>
diff --git a/jaxrs/examples/pom.xml b/jaxrs/examples/pom.xml
@@ -33,9 +33,6 @@
         <module>api-clients</module>
         <module>resteasy-springMVC</module>
         <module>oreilly-workbook</module>
-        <module>oauth</module>
-        <module>oauth-push-messaging</module>
-        <module>oauth-push-messaging-sso</module> 
-        <module>oauth-authenticator</module> 
+        <module>oauth-examples</module>
     </modules>
 </project>