Rename to apis

README.md

@@ -1,18 +1,57 @@
 <pre>
 
-   ____                           _____ 
-  / __ \   /\                    / ____|
- | |  | | /  \ ______ __ _  __ _| (___  
- | |  | |/ /\ \______/ _` |/ _` |\___ \ 
- | |__| / ____ \    | (_| | (_| |____) |
-  \____/_/    \_\    \__,_|\__,_|_____/ 
+
+                                                     MMMMM    M. MM
+                                                     MMM MM  MMM ,M.
+                                                    .NMM 8M .MMM  O
+                                                     .MN MMD.NMMMM
+                                                      MM.NMMM. MMN.   :
+                                                 M.  .M .MMMMD. MM   N
+                                                  M   M MM:MMM  MM.  M
+                                                   N  ,7MM MMMM ?M  M
+                                                   M..,MMM   IM  M. M
+                                                   OM MM.     .M.M,N
+                                                   .MMMM.       :NM.
+                                                    .MMM.      M MM
+                                                     MMMM     M~MMM
+                                                    .MMMMMMMMMMMM.M
+                                                     ..  MMMMMM
+                                                   .NNMMMMM   MM
+                                               ?MMMMMMMMMMM    MM
+                                            MMM8MMZDN,Z  8    MMMM
+                                         NMMM.MDMMMMMM.  . M ,MMM.
+            MMMMMMMMMMM..         ...MMMNM, MMMD,~M8MN   .MM,  . M
+         =MMN,...:M MMMMMMMMMMMMM8MMMMMDD?M  MM?                  M
+        .MD   M.MMMM MM MMMOMM,:MMZMMM   M,:  M:8  M. M    .M     .
+        .DMMM ,.N . MM MMM MM . ..  .. ... . MM+.  MMMM. MMMMM.    N.
+        +. MM . MM 7M.NM   MMM  D  ~  OM..   ,MM.~ M ,   .,M,. M  MM.
+        N: .        IM.    MMM  ..M.. :M, ...    M   N.MD.     .,..
+        8D:M., =M.    ,.          .       ,.M    M. .MMNN
+        MMM,   8M .  NMMM.  .,Z   D. M   .~ MM    N    8N
+        MNM  .  ,     ..N   .~    . , .  OM  .    M,N,.N
+        MM  =M. N,  .M8      .    M$ ..NMM ,..MM  O M.M
+        MM OMM ,.  MN,               .. MM ..:..  MMD
+       .MM M   M  .M  MMMMMMM?  .   .   MMN N ,..M . M
+       ... M MMM  ..NM  .               M .?   8,  NM
+       MM  M MMN:  .MM. .               M. .N.. .. M.
+     ,D M M    D,   M = .               ,: M     ? M M
+     M .  ,M  M        ..              MN $.      MM ~.
+     O~.N..          . ,:              MM.N.      .M
+     MMMM.  Z           :.              .M         NM M
+     MM .. M         D .DM.            . .         ,MM
+     MM   7M           M. M           M..           .  M
+    :M8  . M            7  M          M M            M N,
+     M  MM M             M  N.       .. M             +DM8
+    N    7.MM            NM$,D,       M,MM            ,MM:M
+          $:=M,            MMNM7       MMMN            ,+MMN
+   .MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMZ
 
 </pre>
-OA-aaS
+API Secure
 ======
 <em>(Work in Progress, sponsored by SURFnet)</em>
 
-OAuth Authorization as a Service (OA-aaS) is a generic OAuth2 provider that can be used to kickstart your API authentication.
+API Secure (Apis) is a generic OAuth2 provider that can be used to kickstart your API authentication.
 
 Features
 --------

oaaas-authorization-server-war/pom.xml → apis-authorization-server-war/pom.xml

@@ -1,14 +1,14 @@
 <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">
   <parent>
-    <artifactId>oaaas-parent</artifactId>
-    <groupId>nl.surfnet.oaaas</groupId>
+    <artifactId>apis-parent</artifactId>
+    <groupId>nl.surfnet.apis</groupId>
     <version>0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>oaaas-authorization-server-war</artifactId>
+  <artifactId>apis-authorization-server-war</artifactId>
   <packaging>war</packaging>
-  <name>OA-aaS - authorization server webapp</name>
+  <name>API Secure - authorization server webapp</name>
 
 
   <properties>
@@ -19,8 +19,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>nl.surfnet.oaaas</groupId>
-      <artifactId>oaaas-authorization-server</artifactId>
+      <groupId>nl.surfnet.apis</groupId>
+      <artifactId>apis-authorization-server</artifactId>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

oaaas-authorization-server/pom.xml → apis-authorization-server/pom.xml

@@ -12,15 +12,15 @@
 
 	<parent>
 		<relativePath>../pom.xml</relativePath>
-		<groupId>nl.surfnet.oaaas</groupId>
-		<artifactId>oaaas-parent</artifactId>
+		<groupId>nl.surfnet.apis</groupId>
+		<artifactId>apis-parent</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<groupId>nl.surfnet.oaaas</groupId>
-	<artifactId>oaaas-authorization-server</artifactId>
+	<groupId>nl.surfnet.apis</groupId>
+	<artifactId>apis-authorization-server</artifactId>
 	<packaging>jar</packaging>
-	<name>OA-aaS - authorization server</name>
+	<name>API Secure - authorization server</name>
 
 	<dependencies>
 		<dependency>

oaaas-example-resource-server/.gitignore → apis-example-resource-server-war/.gitignore

@@ -1,6 +1,6 @@
-.classpath
-.project
-.settings
-.idea
-*.iml
-target
+.classpath
+.project
+.settings
+.idea
+*.iml
+target

oaaas-example-resource-server-war/pom.xml → apis-example-resource-server-war/pom.xml

@@ -12,20 +12,20 @@
 
 	<parent>
 		<relativePath>../pom.xml</relativePath>
-		<groupId>nl.surfnet.oaaas</groupId>
-		<artifactId>oaaas-parent</artifactId>
+		<groupId>nl.surfnet.apis</groupId>
+		<artifactId>apis-parent</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<groupId>nl.surfnet.oaaas</groupId>
-	<artifactId>oaaas-example-resource-server-war</artifactId>
+	<groupId>nl.surfnet.apis</groupId>
+	<artifactId>apis-example-resource-server-war</artifactId>
 	<packaging>war</packaging>
-	<name>OA-aaS - example resource server war</name>
+	<name>API Secure - example resource server war</name>
 
 	<dependencies>
 		<dependency>
-			<groupId>nl.surfnet.oaaas</groupId>
-			<artifactId>oaaas-authorization-server</artifactId>
+			<groupId>nl.surfnet.apis</groupId>
+			<artifactId>apis-authorization-server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>

oaaas-example-resource-server-war/.gitignore → apis-example-resource-server/.gitignore

@@ -1,6 +1,6 @@
-.classpath
-.project
-.settings
-.idea
-*.iml
-target
+.classpath
+.project
+.settings
+.idea
+*.iml
+target

oaaas-example-resource-server/pom.xml → apis-example-resource-server/pom.xml

@@ -12,20 +12,20 @@
 
 	<parent>
 		<relativePath>../pom.xml</relativePath>
-		<groupId>nl.surfnet.oaaas</groupId>
-		<artifactId>oaaas-parent</artifactId>
+		<groupId>nl.surfnet.apis</groupId>
+		<artifactId>apis-parent</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<groupId>nl.surfnet.oaaas</groupId>
-	<artifactId>oaaas-example-resource-server</artifactId>
+	<groupId>nl.surfnet.apis</groupId>
+	<artifactId>apis-example-resource-server</artifactId>
 	<packaging>jar</packaging>
-	<name>OA-aaS - example resource server</name>
+	<name>API Secure - example resource server</name>
 
 	<dependencies>
 		<dependency>
-			<groupId>nl.surfnet.oaaas</groupId>
-			<artifactId>oaaas-authorization-server</artifactId>
+			<groupId>nl.surfnet.apis</groupId>
+			<artifactId>apis-authorization-server</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -107,9 +107,9 @@
 				<goals> <goal>shade</goal> </goals> <configuration> <transformers> <transformer 
 				implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" 
 				/> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> 
-				<mainClass>org.surfnet.oaaas.example.api.UniversityFooService</mainClass> 
+				<mainClass>org.surfnet.apis.example.api.UniversityFooService</mainClass> 
 				</transformer> </transformers> </configuration> </execution> </executions> 
 				</plugin> -->
 		</plugins>
 	</build>
-</project>
+</project>

oaaas-surfconext-authn/pom.xml → apis-surfconext-authn/pom.xml

@@ -13,23 +13,23 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>nl.surfnet.oaaas</groupId>
-		<artifactId>oaaas-parent</artifactId>
+		<groupId>nl.surfnet.apis</groupId>
+		<artifactId>apis-parent</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<groupId>nl.surfnet.oaaas</groupId>
-	<artifactId>oaaas-surfconext-authn</artifactId>
-	<name>OA-aaS - conext authentication plugin</name>
+	<groupId>nl.surfnet.apis</groupId>
+	<artifactId>apis-surfconext-authn</artifactId>
+	<name>API Secure - conext authentication plugin</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.surfnet.coin</groupId>
 			<artifactId>spring-security-opensaml</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>nl.surfnet.oaaas</groupId>
-			<artifactId>oaaas-authorization-server</artifactId>
+			<groupId>nl.surfnet.apis</groupId>
+			<artifactId>apis-authorization-server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -40,4 +40,4 @@
 			<artifactId>javax.inject</artifactId>
 		</dependency>
   </dependencies>
-</project>
+</project>

pom.xml

@@ -10,11 +10,11 @@
 	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>nl.surfnet.oaaas</groupId>
-	<artifactId>oaaas-parent</artifactId>
+	<groupId>nl.surfnet.apis</groupId>
+	<artifactId>apis-parent</artifactId>
 	<version>0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>OA-aaS</name>
+	<name>API Secure</name>
 
 
   <inceptionYear>2012</inceptionYear>
@@ -51,14 +51,11 @@
 
 
   <modules>
-		<module>oaaas-example-resource-server</module>
-		<module>oaaas-authorization-server</module>
-		<module>oaaas-authorization-server-war</module>
-		<module>oaaas-surfconext-authn</module>
-		<module>oaaas-example-resource-server-war</module>
-		<!--<module>oaaas-performance</module> -->
-		<!--<module>oaaas-vm</module> -->
-		<!--<module>oaaas-gui</module> -->
+		<module>apis-example-resource-server</module>
+		<module>apis-authorization-server</module>
+		<module>apis-authorization-server-war</module>
+		<module>apis-surfconext-authn</module>
+		<module>apis-example-resource-server-war</module>
 	</modules>
 
 	<properties>
@@ -243,18 +240,13 @@
 				<version>${commons-lang.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>nl.surfnet.oaaas</groupId>
-				<artifactId>oaaas-client</artifactId>
+				<groupId>nl.surfnet.apis</groupId>
+				<artifactId>apis-authorization-server</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>nl.surfnet.oaaas</groupId>
-				<artifactId>oaaas-authorization-server</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>nl.surfnet.oaaas</groupId>
-				<artifactId>oaaas-surfconext-authn</artifactId>
+				<groupId>nl.surfnet.apis</groupId>
+				<artifactId>apis-surfconext-authn</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>