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 2021/04/06 11:53:15 UTC
[isis] branch master updated: ISIS-2599: purge module microprofile
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
The following commit(s) were added to refs/heads/master by this push:
new 7933b5d ISIS-2599: purge module microprofile
7933b5d is described below
commit 7933b5d893bee14dfae79045a75e0937b63055da
Author: ahuber@apache.org <ah...@luna>
AuthorDate: Tue Apr 6 13:53:07 2021 +0200
ISIS-2599: purge module microprofile
---
antora/playbooks/site-incubator.yml | 3 -
antora/playbooks/site.yml | 3 -
examples/demo/jee/pom.xml | 8 --
incubator/mappings/microprofile/pom.xml | 74 --------------
.../mappings/microprofile/src/main/adoc/antora.yml | 19 ----
.../src/main/adoc/modules/microprofile/nav.adoc | 4 -
.../adoc/modules/microprofile/pages/about.adoc | 5 -
.../modules/microprofile/partials/module-nav.adoc | 7 --
.../jee_support/IsisCDIBeanScanInterceptor.java | 113 ---------------------
.../services/javax.enterprise.inject.spi.Extension | 1 -
incubator/pom.xml | 7 --
11 files changed, 244 deletions(-)
diff --git a/antora/playbooks/site-incubator.yml b/antora/playbooks/site-incubator.yml
index 6b8dde2..f27f62c 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -46,9 +46,6 @@ content:
- url: .
start_path: incubator/viewers/vaadin/adoc # incubator
branches: HEAD
- - url: .
- start_path: incubator/mappings/microprofile/src/main/adoc # incubator
- branches: HEAD
# mavendeps
- url: .
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 615508e..fd251cf 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -163,9 +163,6 @@ content:
- url: .
start_path: incubator/viewers/vaadin/adoc # incubator
branches: HEAD
- - url: .
- start_path: incubator/mappings/microprofile/src/main/adoc # incubator
- branches: HEAD
# mappings
- url: .
diff --git a/examples/demo/jee/pom.xml b/examples/demo/jee/pom.xml
index 8f4184f..11c5240 100644
--- a/examples/demo/jee/pom.xml
+++ b/examples/demo/jee/pom.xml
@@ -110,14 +110,6 @@
<type>pom</type>
</dependency>
- <!-- JEE SUPPORT -->
-
- <dependency>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator-microprofile</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
diff --git a/incubator/mappings/microprofile/pom.xml b/incubator/mappings/microprofile/pom.xml
deleted file mode 100644
index d9059cf..0000000
--- a/incubator/mappings/microprofile/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>isis-incubator-microprofile</artifactId>
- <name>Apache Isis Inc - MicroProfile Support</name>
- <description>
- Initial sketches
- </description>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.incubator.microprofile</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/incubator/microprofile</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </exclusion>
- <!-- <exclusion> -->
- <!-- <groupId>org.springframework</groupId> -->
- <!-- <artifactId>spring-webmvc</artifactId> -->
- <!-- </exclusion> -->
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-batch</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/incubator/mappings/microprofile/src/main/adoc/antora.yml b/incubator/mappings/microprofile/src/main/adoc/antora.yml
deleted file mode 100644
index bc87cdc..0000000
--- a/incubator/mappings/microprofile/src/main/adoc/antora.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-name: incubator
-version: latest
diff --git a/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/nav.adoc b/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/nav.adoc
deleted file mode 100644
index b978522..0000000
--- a/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-:Notice: 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 ag [...]
-
-include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc b/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
deleted file mode 100644
index 9bd6407..0000000
--- a/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= MicroProfile
-
-:Notice: 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 ag [...]
-
-WARNING: TODO
diff --git a/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc b/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc
deleted file mode 100644
index 0508ed1..0000000
--- a/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-* xref:incubator:microprofile:about.adoc[MicroProfile]
-
-
-
diff --git a/incubator/mappings/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java b/incubator/mappings/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
deleted file mode 100644
index ad3bd90..0000000
--- a/incubator/mappings/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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 org.apache.isis.core.runtime.jee_support;
-
-import java.util.List;
-import java.util.function.Predicate;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.servlet.ServletContextListener;
-import javax.servlet.http.HttpServlet;
-
-import org.springframework.stereotype.Component;
-
-import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.reflection._Annotations;
-
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
-/**
- *
- * A CDI inject extension @see <a href="https://docs.jboss.org/weld/reference/latest/en-US/html/extend.html">weld</a>,
- * that lets CDI ignore certain Beans we declare vetoed.
- * <p>
- * This extension is registered as a service provider by creating a file named
- * {@code META-INF/services/javax.enterprise.inject.spi.Extension},
- * which contains the name of this extension class.
- * </p>
- *
- * <p>
- * Beans declared vetoed are managed (meaning instantiation and dependency injection)
- * by Isis itself. All other Beans are allowed to be managed by CDI.
- * </p>
- *
- *
- */
-@Log4j2
-public final class IsisCDIBeanScanInterceptor implements Extension {
-
- /**
- * Declaration of Beans that are managed by Isis and should be ignored by CDI.
- * (in addition to those that have the @DomainService annotation)
- */
- private static final List<Predicate<Class<?>>> vetoTests = _Lists.of(
- ExceptionRecognizer.class::isAssignableFrom,
- ServletContextListener.class::isAssignableFrom, // seems this has no effect anyway
- HttpServlet.class::isAssignableFrom, // seems this has no effect either
- type->type.getName().startsWith("org.springframework."),
- type->type.getName().startsWith("org.apache.isis."),
- type->_Annotations.isPresent(type, Component.class));
-
- void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event) {
- log.info("beginning the scanning process");
- }
-
- <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> event) {
-
- final Class<?> type = event.getAnnotatedType().getJavaClass();
- final String className = type.getName();
-
- val isVetoed = isVetoed(type);
- if(isVetoed) {
- event.veto();
- }
-
- if(log.isDebugEnabled()) {
- if(isVetoed) {
- log.debug("vetoing type: {}", className);
- } else {
- log.debug("allowing type: {}", className);
- }
- }
-
- }
-
- void afterBeanDiscovery(@Observes AfterBeanDiscovery event) {
- log.info("finished the scanning process");
- }
-
- // -- HELPER
-
- private boolean isVetoed(Class<?> type) {
-
- for(val vetoTest : vetoTests) {
- if(vetoTest.test(type)) {
- return true;
- }
- }
- return false;
- }
-
-}
diff --git a/incubator/mappings/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/incubator/mappings/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
deleted file mode 100644
index 2f1450f..0000000
--- a/incubator/mappings/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.isis.core.runtime.jee_support.IsisCDIBeanScanInterceptor
\ No newline at end of file
diff --git a/incubator/pom.xml b/incubator/pom.xml
index be8b0dc..7473fdd 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -141,12 +141,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator-microprofile</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.isis.incubator.viewer</groupId>
<artifactId>isis-viewer-vaadin</artifactId>
<version>2.0.0-SNAPSHOT</version>
@@ -190,7 +184,6 @@
</dependencies>
<modules>
-<!-- <module>mappings/microprofile</module> -->
<!-- <module>clients/kroviz</module> -->
<module>viewers/vaadin</module>
<module>viewers/javafx</module>