Refactored and combined client jar and authorization jar

oaaas-authorization-server-war/src/main/resources/application.properties

@@ -0,0 +1,31 @@
+#
+# Copyright 2012 SURFnet bv, The Netherlands
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+#
+
+
+jdbc.driverClassName=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:file:target/db
+jdbc.username=sa
+jdbc.password=
+
+authenticatorClass=org.surfnet.oaaas.basic.BasicAuthenticator
+userConsentHandlerClass=org.surfnet.oaaas.simple.FormUserConsentHandler
+
+adminService.tokenVerificationUrl=http://localhost:8080/v1/tokeninfo
+adminService.resourceServerKey=authorization-server-admin
+adminService.resourceServerSecret=cafebabe-cafe-babe-cafe-babecafebabe
+
+# Either db/migration/mysql or db/migration/hsqldb
+flyway.migrations.location=db/migration/hsqldb

oaaas-authorization-server-war/src/main/webapp/example.js

@@ -0,0 +1 @@
+testje

oaaas-authorization-server-war/src/test/java/it/VerifyResourceTestIT.java

@@ -20,7 +20,7 @@
 import com.sun.jersey.api.client.ClientResponse;
 
 import org.junit.Test;
-import org.surfnet.oaaas.auth.VerifyTokenResponse;
+import org.surfnet.oaaas.model.VerifyTokenResponse;
 
 import static org.junit.Assert.assertEquals;