From 3d4b705f8fbc0ccf9908a5b179170d2a84f93d4d Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Wed, 4 Dec 2019 16:47:28 +0100
Subject: [PATCH] docu

---
 pom.xml                                                   | 6 ++++++
 .../webservice/weblayer/WebServiceSecurityConfig.java     | 4 ++--
 src/main/resources/config/application-dev-ws.properties   | 6 ++++--
 src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java    | 8 +++++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ae01e4a..c17a7e02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,6 +290,12 @@
       <version>1.0.9.RELEASE</version>
     </dependency>
 
+    <!-- JMX -->
+<!--     <dependency> -->
+<!--       <groupId>org.jolokia</groupId> -->
+<!--       <artifactId>jolokia-core</artifactId> -->
+<!--     </dependency> -->
+
     <!-- Apache HTTP -->
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceSecurityConfig.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceSecurityConfig.java
index 56349ae2..86970fbd 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceSecurityConfig.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceSecurityConfig.java
@@ -46,7 +46,6 @@ import org.springframework.security.oauth2.provider.token.UserAuthenticationConv
 import org.springframework.security.web.AuthenticationEntryPoint;
 
 import ch.ethz.seb.sebserver.WebSecurityConfig;
-import ch.ethz.seb.sebserver.gbl.model.user.UserRole;
 import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
 import ch.ethz.seb.sebserver.webservice.weblayer.oauth.CachableJdbcTokenStore;
 import ch.ethz.seb.sebserver.webservice.weblayer.oauth.WebClientDetailsService;
@@ -285,7 +284,8 @@ public class WebServiceSecurityConfig extends WebSecurityConfigurerAdapter {
             http.antMatcher(apiEndpoint + "/**")
                     .authorizeRequests()
                     .anyRequest()
-                    .hasAuthority(UserRole.SEB_SERVER_ADMIN.name());
+                    .permitAll();
+            // .hasAuthority(UserRole.SEB_SERVER_ADMIN.name());
         }
 
     }
diff --git a/src/main/resources/config/application-dev-ws.properties b/src/main/resources/config/application-dev-ws.properties
index fd3ad06c..dcae67db 100644
--- a/src/main/resources/config/application-dev-ws.properties
+++ b/src/main/resources/config/application-dev-ws.properties
@@ -60,5 +60,7 @@ sebserver.webservice.lms.address.alias=lms.mockup.com=lms.address.alias
 sebserver.webservice.lms.openedx.seb.restriction.push-count=10
 
 # actuator configuration
-management.endpoints.web.base-path=/actuator
-management.endpoints.web.exposure.include=logfile,loggers
\ No newline at end of file
+management.server.port=${server.port}
+management.endpoints.web.base-path=/management
+management.endpoints.web.exposure.include=logfile,loggers,jolokia
+management.endpoints.web.path-mapping.jolokia=jmx
\ No newline at end of file
diff --git a/src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java b/src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java
index c7ac0bee..652e1888 100644
--- a/src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java
+++ b/src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java
@@ -51,6 +51,7 @@ public class HTTPClientBot {
     private static final long ONE_SECOND = 1000; // milliseconds
     private static final long TEN_SECONDS = 10 * ONE_SECOND;
     private static final long ONE_MINUTE = 60 * ONE_SECOND;
+    private static final long ONE_HOUR = 60 * ONE_MINUTE;
 
     private static final Logger log = LoggerFactory.getLogger(HTTPClientBot.class);
 
@@ -78,8 +79,8 @@ public class HTTPClientBot {
 
     public HTTPClientBot(final Map<String, String> args) {
 
-        //this.webserviceAddress = args.getOrDefault("webserviceAddress", "http://ralph.ethz.ch:8080");
-        this.webserviceAddress = args.getOrDefault("webserviceAddress", "http://localhost:8080");
+        this.webserviceAddress = args.getOrDefault("webserviceAddress", "http://ralph.ethz.ch:8080");
+        // this.webserviceAddress = args.getOrDefault("webserviceAddress", "http://localhost:8080");
         //this.webserviceAddress = args.getOrDefault("webserviceAddress", "https://seb.test-swissmooc.ch");
 
         this.accessTokenEndpoint = args.getOrDefault("accessTokenEndpoint", "/oauth/token");
@@ -98,7 +99,8 @@ public class HTTPClientBot {
         this.numberOfConnections = Integer.parseInt(args.getOrDefault("numberOfConnections", "4"));
         this.pingInterval = Long.parseLong(args.getOrDefault("pingInterval", "200"));
         this.errorInterval = Long.parseLong(args.getOrDefault("errorInterval", String.valueOf(TEN_SECONDS)));
-        this.runtime = Long.parseLong(args.getOrDefault("runtime", String.valueOf(ONE_MINUTE)));
+//        this.runtime = Long.parseLong(args.getOrDefault("runtime", String.valueOf(ONE_MINUTE)));
+        this.runtime = Long.parseLong(args.getOrDefault("runtime", String.valueOf(ONE_HOUR)));
         this.connectionAttempts = Integer.parseInt(args.getOrDefault("connectionAttempts", "1"));
 
         for (int i = 0; i < this.numberOfConnections; i++) {