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 2018/09/18 10:08:05 UTC
[isis] branch v2 updated: ISIS-1988: Move isis-core-wrapper into
isis-core-runtime.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 0aafcc6 ISIS-1988: Move isis-core-wrapper into isis-core-runtime.
0aafcc6 is described below
commit 0aafcc6c8cefed5e6c47b0a76e0cf18664e6360b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 18 12:07:59 2018 +0200
ISIS-1988: Move isis-core-wrapper into isis-core-runtime.
Task-Url: https://issues.apache.org/jira/browse/ISIS-1988
---
core/pom.xml | 1 -
.../isis/core/wrapper/WrapperFactoryDefault.java | 3 +-
.../dispatchers/InteractionEventDispatcher.java | 0
.../InteractionEventDispatcherTypeSafe.java | 0
.../AbstractCollectionInvocationHandler.java | 0
.../handlers/CollectionInvocationHandler.java | 0
.../handlers/DelegatingInvocationHandler.java | 0
.../DelegatingInvocationHandlerDefault.java | 0
.../handlers/DomainObjectInvocationHandler.java | 0
.../wrapper/handlers/MapInvocationHandler.java | 0
.../core/wrapper/handlers/ProxyContextHandler.java | 0
.../isis/core/wrapper/internal/util/Constants.java | 0
.../wrapper/internal/util/MethodPrefixFinder.java | 0
.../isis/core/wrapper/proxy/ProxyCreator.java | 0
.../core/wrapper/WrapperFactoryDefaultTest.java | 0
.../progmodel/wrapper/dom/claims/Approver.java | 0
.../progmodel/wrapper/dom/claims/Claimant.java | 0
.../progmodel/wrapper/dom/employees/Employee.java | 0
.../wrapper/dom/employees/EmployeeRepository.java | 0
.../dom/employees/EmployeeRepositoryImpl.java | 0
core/wrapper/pom.xml | 111 ---------------------
21 files changed, 2 insertions(+), 113 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 1d6d5d9..437394c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2487,7 +2487,6 @@ ${license.additional-notes}
<module>log4j</module>
<module>metamodel</module>
<module>runtime</module>
- <module>wrapper</module>
<module>webserver</module>
<module>security</module>
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
similarity index 98%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index c9002c9..b1a4f67 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -48,6 +48,7 @@ import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
+import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@@ -242,7 +243,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
final ExecutionMode wrapperMode = wrapperObject.__isis_executionMode();
if(wrapperMode != mode) {
final Object underlyingDomainObject = wrapperObject.__isis_wrapped();
- return (T)createProxy(underlyingDomainObject, mode, isisSessionFactory);
+ return _Casts.uncheckedCast(createProxy(underlyingDomainObject, mode, isisSessionFactory));
}
return domainObject;
}
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcher.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcher.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcher.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcher.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/CollectionInvocationHandler.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/CollectionInvocationHandler.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/CollectionInvocationHandler.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/CollectionInvocationHandler.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandler.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandler.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandler.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandler.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/MapInvocationHandler.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/MapInvocationHandler.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/MapInvocationHandler.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/MapInvocationHandler.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/internal/util/Constants.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/internal/util/Constants.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/internal/util/Constants.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/internal/util/Constants.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/internal/util/MethodPrefixFinder.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/internal/util/MethodPrefixFinder.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/internal/util/MethodPrefixFinder.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/internal/util/MethodPrefixFinder.java
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java
similarity index 100%
rename from core/wrapper/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java
rename to core/runtime/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest.java
similarity index 100%
rename from core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest.java
diff --git a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/claims/Approver.java b/core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/claims/Approver.java
similarity index 100%
rename from core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/claims/Approver.java
rename to core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/claims/Approver.java
diff --git a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/claims/Claimant.java b/core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/claims/Claimant.java
similarity index 100%
rename from core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/claims/Claimant.java
rename to core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/claims/Claimant.java
diff --git a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/Employee.java b/core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/Employee.java
similarity index 100%
rename from core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/Employee.java
rename to core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/Employee.java
diff --git a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/EmployeeRepository.java b/core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/EmployeeRepository.java
similarity index 100%
rename from core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/EmployeeRepository.java
rename to core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/EmployeeRepository.java
diff --git a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/EmployeeRepositoryImpl.java b/core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/EmployeeRepositoryImpl.java
similarity index 100%
rename from core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/EmployeeRepositoryImpl.java
rename to core/runtime/src/test/java/org/apache/isis/progmodel/wrapper/dom/employees/EmployeeRepositoryImpl.java
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
deleted file mode 100644
index f7337ab..0000000
--- a/core/wrapper/pom.xml
+++ /dev/null
@@ -1,111 +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.
--->
-<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.core</groupId>
- <artifactId>isis</artifactId>
- <version>${revision}</version>
- </parent>
-
- <artifactId>isis-core-wrapper</artifactId>
-
- <name>Apache Isis Wrapper Service</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.core.wrapper</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/core/wrapper</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
-
-
- <!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>flatten</id>
- <activation>
- <property>
- <name>!skip.flatten</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <version>1.0.0</version>
- <executions>
- <execution>
- <id>flatten</id>
- <phase>process-resources</phase>
- <goals>
- <goal>flatten</goal>
- </goals>
- <configuration>
- <flattenMode>defaults</flattenMode>
- <updatePomFile>true</updatePomFile>
- <pomElements>
- <name>resolve</name>
- <description>resolve</description>
- <dependencies>resolve</dependencies>
- </pomElements>
- </configuration>
- </execution>
- <execution>
- <id>flatten.clean</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-
-</project>