Merge branch 'DEVELOP_BE' of ssh://git.eclipse.org/gitroot/elogbook/authandauth into DEVELOP_BE
diff --git a/pom.xml b/pom.xml
index 3151c18..d857599 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,15 +6,12 @@
<groupId>openk.pta.de</groupId>
<artifactId>portal</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
<packaging>war</packaging>
<properties>
<skip.asciidoc>false</skip.asciidoc>
<httpclient.version>4.5.3</httpclient.version>
- <jersey-bundle.version>1.19.3</jersey-bundle.version>
- <org.json.version>20160810</org.json.version>
- <jersey.server.version>1.19.3</jersey.server.version>
<gson.version>2.8.0</gson.version>
<log4j.version>1.2.17</log4j.version>
<commons-io.version>2.5</commons-io.version>
@@ -34,22 +31,11 @@
<version>${httpclient.version}</version>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${org.json.version}</version>
+ <groupId>org.glassfish.jersey.bundles</groupId>
+ <artifactId>jaxrs-ri</artifactId>
+ <version>2.22.1</version>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>3.0.21.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
- <version>3.0.12.Final</version>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
diff --git a/src/main/asciidoc/architectureDocumentation/auth_n_auth_architectureDocumentation.adoc b/src/main/asciidoc/architectureDocumentation/auth_n_auth_architectureDocumentation.adoc
index 7abfa88..3281812 100644
--- a/src/main/asciidoc/architectureDocumentation/auth_n_auth_architectureDocumentation.adoc
+++ b/src/main/asciidoc/architectureDocumentation/auth_n_auth_architectureDocumentation.adoc
@@ -1,4 +1,15 @@
-openKonsequenz - Architecture of the module "portal@openK"
+////
+******************************************************************************
+* Copyright © 2018 PTA GmbH.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+*
+* http://www.eclipse.org/legal/epl-v10.html
+*
+******************************************************************************
+////
+openKonsequenz - Architecture of the module "portal@openK"
==========================================================
:Author: Frank Dietrich
:Email: frank.dietrich@pta.de
diff --git a/src/main/asciidoc/howto/auth_n_auth_howtoBuild.adoc b/src/main/asciidoc/howto/auth_n_auth_howtoBuild.adoc
index f325b3e..f71a473 100644
--- a/src/main/asciidoc/howto/auth_n_auth_howtoBuild.adoc
+++ b/src/main/asciidoc/howto/auth_n_auth_howtoBuild.adoc
@@ -1,3 +1,14 @@
+////
+******************************************************************************
+* Copyright © 2018 PTA GmbH.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+*
+* http://www.eclipse.org/legal/epl-v10.html
+*
+******************************************************************************
+////
= openKonsequenz - How to build the module "portal@openK"
:Date: 2017-11-17
:Revision: 1
diff --git a/src/main/asciidoc/howto/auth_n_auth_howtoRun.adoc b/src/main/asciidoc/howto/auth_n_auth_howtoRun.adoc
index b3afbbe..bddebfc 100644
--- a/src/main/asciidoc/howto/auth_n_auth_howtoRun.adoc
+++ b/src/main/asciidoc/howto/auth_n_auth_howtoRun.adoc
@@ -1,3 +1,14 @@
+////
+******************************************************************************
+* Copyright © 2018 PTA GmbH.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+*
+* http://www.eclipse.org/legal/epl-v10.html
+*
+******************************************************************************
+////
= openKonsequenz - How to run the module "portal@openK"
:Date: 2017-11-17
:Revision: 1
diff --git a/src/main/asciidoc/interfaceDocumentation/auth_n_auth_interfaceDocumentation.adoc b/src/main/asciidoc/interfaceDocumentation/auth_n_auth_interfaceDocumentation.adoc
index 8db2339..d9aed64 100644
--- a/src/main/asciidoc/interfaceDocumentation/auth_n_auth_interfaceDocumentation.adoc
+++ b/src/main/asciidoc/interfaceDocumentation/auth_n_auth_interfaceDocumentation.adoc
@@ -1,4 +1,15 @@
-authAndAuth@openK - Backend REST-Service documentation
+////
+******************************************************************************
+* Copyright © 2018 PTA GmbH.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+*
+* http://www.eclipse.org/legal/epl-v10.html
+*
+******************************************************************************
+////
+authAndAuth@openK - Backend REST-Service documentation
======================================================
:Author: Frank Dietrich
:Email: frank.dietrich@pta.de
diff --git a/src/main/java/org/eclipse/openk/portal/rest/BackendRestService.java b/src/main/java/org/eclipse/openk/portal/rest/BackendRestService.java
index 79ce8e8..bf13edb 100644
--- a/src/main/java/org/eclipse/openk/portal/rest/BackendRestService.java
+++ b/src/main/java/org/eclipse/openk/portal/rest/BackendRestService.java
@@ -138,7 +138,7 @@
@GET
@Path("/healthcheck")
@Produces("application/json")
- public Response getHealthCheck(@FormParam(value = "pretty") boolean yn) {
+ public Response getHealthCheck() {
HealthChecker hc = new HealthChecker();
hc.register("Keycloak present", new KeyCloakPresentHealthCheck());
diff --git a/src/main/resources/_backendConfigCustom.json b/src/main/resources/_backendConfigCustom.json
index df350b7..430658e 100644
--- a/src/main/resources/_backendConfigCustom.json
+++ b/src/main/resources/_backendConfigCustom.json
@@ -5,6 +5,6 @@
"keycloakRealm": "elogbook",
"keycloakClient": "elogbook-backend",
"keycloakAdmin": "admin",
- "keycloakPW": "nimda",
+ "keycloakPW": "admin",
"maxLoadUsers": 1000
}
\ No newline at end of file
diff --git a/src/main/resources/backendConfigDevLocal.json b/src/main/resources/backendConfigDevLocal.json
index df350b7..430658e 100644
--- a/src/main/resources/backendConfigDevLocal.json
+++ b/src/main/resources/backendConfigDevLocal.json
@@ -5,6 +5,6 @@
"keycloakRealm": "elogbook",
"keycloakClient": "elogbook-backend",
"keycloakAdmin": "admin",
- "keycloakPW": "nimda",
+ "keycloakPW": "admin",
"maxLoadUsers": 1000
}
\ No newline at end of file
diff --git a/src/main/resources/backendConfigDocker.json b/src/main/resources/backendConfigDocker.json
index 42cf5a4..4820cf5 100644
--- a/src/main/resources/backendConfigDocker.json
+++ b/src/main/resources/backendConfigDocker.json
@@ -5,6 +5,6 @@
"keycloakRealm": "portaldocker",
"keycloakClient": "portal-docker",
"keycloakAdmin": "admin",
- "keycloakPW": "nimda",
+ "keycloakPW": "admin",
"maxLoadUsers": 1000
}
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 2b6bcdb..2ce8042 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -5,33 +5,22 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>Restful Web Application</display-name>
- <context-param>
- <param-name>resteasy.servlet.mapping.prefix</param-name>
- <param-value>/rest</param-value>
- </context-param>
-
- <context-param>
- <param-name>resteasy.scan</param-name>
- <param-value>false</param-value>
- </context-param>
-
- <listener>
- <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
- </listener>
-
<servlet>
- <servlet-name>Resteasy</servlet-name>
+ <servlet-name>jersey-serlvet</servlet-name>
<servlet-class>
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher
+ org.glassfish.jersey.servlet.ServletContainer
</servlet-class>
<init-param>
- <param-name>javax.ws.rs.Application</param-name>
- <param-value>org.eclipse.openk.portal.rest.RestServiceConfiguration</param-value>
+ <param-name>jersey.config.server.provider.packages</param-name>
+ <param-value>org.eclipse.openk.portal.rest</param-value>
</init-param>
+ <load-on-startup>1</load-on-startup>
+
</servlet>
+
<servlet-mapping>
- <servlet-name>Resteasy</servlet-name>
+ <servlet-name>jersey-serlvet</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>
diff --git a/src/test/java/org/eclipse/openk/portal/common/BackendConfigTest.java b/src/test/java/org/eclipse/openk/portal/common/BackendConfigTest.java
index 4efadc9..ae62598 100644
--- a/src/test/java/org/eclipse/openk/portal/common/BackendConfigTest.java
+++ b/src/test/java/org/eclipse/openk/portal/common/BackendConfigTest.java
@@ -26,7 +26,7 @@
assertEquals( "elogbook", bc.getKeycloakRealm());
assertEquals( "elogbook-backend", bc.getKeycloakClient());
assertEquals( "admin", bc.getKeycloakAdmin() );
- assertEquals( "nimda", bc.getKeycloakPW() );
+ assertEquals( "admin", bc.getKeycloakPW() );
assertEquals( "backendConfigDevLocal.json", BackendConfig.getConfigFileName() );
BackendConfig.setConfigFileName("backendConfigProduction.json");
assertEquals( "backendConfigProduction.json", BackendConfig.getConfigFileName() );
diff --git a/src/test/java/org/eclipse/openk/portal/health/base/NamedHealthCheckResultTest.java b/src/test/java/org/eclipse/openk/portal/health/base/NamedHealthCheckResultTest.java
index 0fdd4e7..9cb9770 100644
--- a/src/test/java/org/eclipse/openk/portal/health/base/NamedHealthCheckResultTest.java
+++ b/src/test/java/org/eclipse/openk/portal/health/base/NamedHealthCheckResultTest.java
@@ -1,3 +1,14 @@
+/**
+ ******************************************************************************
+ * Copyright © 2017-2018 PTA GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ ******************************************************************************
+ */
package org.eclipse.openk.portal.health.base;
import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openk/portal/health/base/ResultTest.java b/src/test/java/org/eclipse/openk/portal/health/base/ResultTest.java
index 9379922..a2056b0 100644
--- a/src/test/java/org/eclipse/openk/portal/health/base/ResultTest.java
+++ b/src/test/java/org/eclipse/openk/portal/health/base/ResultTest.java
@@ -1,3 +1,14 @@
+/**
+ ******************************************************************************
+ * Copyright © 2017-2018 PTA GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ ******************************************************************************
+ */
package org.eclipse.openk.portal.health.base;
import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openk/portal/health/impl/KeyCloakPresentHealthCheckTest.java b/src/test/java/org/eclipse/openk/portal/health/impl/KeyCloakPresentHealthCheckTest.java
index 1727b6a..25ef190 100644
--- a/src/test/java/org/eclipse/openk/portal/health/impl/KeyCloakPresentHealthCheckTest.java
+++ b/src/test/java/org/eclipse/openk/portal/health/impl/KeyCloakPresentHealthCheckTest.java
@@ -1,3 +1,14 @@
+/**
+ ******************************************************************************
+ * Copyright © 2017-2018 PTA GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ ******************************************************************************
+ */
package org.eclipse.openk.portal.health.impl;
import org.junit.Before;
