You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/06/19 20:36:44 UTC
[isis] branch master updated (9cf91c7 -> c438b27)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 9cf91c7 ISIS-2340: removing Secman config option, instead reuse Shiro
new 5a6b518 ISIS-2340: fix DemoAppVaadin build
new c438b27 ISIS-2340: fix DemoAppVaadin build (2)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/demoapp/webapp/vaadin/DemoAppVaadin.java | 2 +-
.../webapp/vaadin}/utils/ThereCanBeOnlyOne.java | 20 +++++++++++++++++++-
.../webapp/wicket/utils/ThereCanBeOnlyOne.java | 18 ++++++++++++++++++
3 files changed, 38 insertions(+), 2 deletions(-)
copy examples/demo/{wicket/src/main/java/demoapp/webapp/wicket => vaadin/src/main/java/demoapp/webapp/vaadin}/utils/ThereCanBeOnlyOne.java (69%)
[isis] 02/02: ISIS-2340: fix DemoAppVaadin build (2)
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c438b2763d476b7bdea745993a8052ae59da6522
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 19 22:36:29 2020 +0200
ISIS-2340: fix DemoAppVaadin build (2)
---
.../webapp/vaadin/utils/ThereCanBeOnlyOne.java | 75 ++++++++++++++++++++++
1 file changed, 75 insertions(+)
diff --git a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/utils/ThereCanBeOnlyOne.java b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/utils/ThereCanBeOnlyOne.java
new file mode 100644
index 0000000..9cf9e2e
--- /dev/null
+++ b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/utils/ThereCanBeOnlyOne.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package demoapp.webapp.vaadin.utils;
+
+import java.io.IOException;
+
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.HttpClientBuilder;
+
+import lombok.val;
+
+public class ThereCanBeOnlyOne {
+
+ public static void remoteShutdownOthersIfAny() {
+ try {
+ invokeRemoteShutdown();
+ } catch (Exception e) {
+ // ignore them all
+ }
+ }
+
+ private static void invokeRemoteShutdown() throws IOException {
+
+ val targetHost = new HttpHost("localhost", 8080, "http");
+ val credsProvider = new BasicCredentialsProvider();
+ credsProvider.setCredentials(
+ new AuthScope(targetHost.getHostName(), targetHost.getPort()),
+ new UsernamePasswordCredentials("sven", "pass"));
+
+ // Create AuthCache instance
+ AuthCache authCache = new BasicAuthCache();
+ // Generate BASIC scheme object and add it to the local auth cache
+ BasicScheme basicAuth = new BasicScheme();
+ authCache.put(targetHost, basicAuth);
+
+ // Add AuthCache to the execution context
+ HttpClientContext context = HttpClientContext.create();
+ context.setCredentialsProvider(credsProvider);
+ context.setAuthCache(authCache);
+
+ val httpget = new HttpGet("/restful/services/demo.LineBreaker/actions/shutdown/invoke");
+
+ try(val httpClient = HttpClientBuilder.create().build()){
+ try(val response = httpClient.execute(targetHost, httpget, context)) {
+ response.getEntity();
+ }
+ }
+
+ }
+
+}
[isis] 01/02: ISIS-2340: fix DemoAppVaadin build
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5a6b518aea914a756e70254c7c22177db1321d69
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 19 22:35:39 2020 +0200
ISIS-2340: fix DemoAppVaadin build
---
.../main/java/demoapp/webapp/vaadin/DemoAppVaadin.java | 2 +-
.../demoapp/webapp/wicket/utils/ThereCanBeOnlyOne.java | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
index 90a7f81..6218f12 100644
--- a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
+++ b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
@@ -33,8 +33,8 @@ import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
import org.apache.isis.valuetypes.sse.ui.IsisModuleValSseUi;
import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
-import demoapp.utils.ThereCanBeOnlyOne;
import demoapp.webapp.DemoAppManifest;
+import demoapp.webapp.vaadin.utils.ThereCanBeOnlyOne;
/**
* Bootstrap the application.
diff --git a/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/utils/ThereCanBeOnlyOne.java b/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/utils/ThereCanBeOnlyOne.java
index 5066753..dcc857e 100644
--- a/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/utils/ThereCanBeOnlyOne.java
+++ b/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/utils/ThereCanBeOnlyOne.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
package demoapp.webapp.wicket.utils;
import java.io.IOException;