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/05/19 09:37:31 UTC
[isis] 10/13: ISIS-1949: cleanup plugin dependencies
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 6a29e8b3a66124f4aea7747599c8aae007ed1207
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat May 19 10:20:35 2018 +0200
ISIS-1949: cleanup plugin dependencies
Task-Url: https://issues.apache.org/jira/browse/ISIS-1949
---
core/plugins/codegen-javassist/pom.xml | 10 +++
.../proxy/ProxyCreatorTestUsingJavassist.java} | 17 +++-
core/pom.xml | 18 +++-
core/wrapper/pom.xml | 100 ++++++++++-----------
4 files changed, 89 insertions(+), 56 deletions(-)
diff --git a/core/plugins/codegen-javassist/pom.xml b/core/plugins/codegen-javassist/pom.xml
index d7f4b7b..69a5977 100644
--- a/core/plugins/codegen-javassist/pom.xml
+++ b/core/plugins/codegen-javassist/pom.xml
@@ -52,7 +52,9 @@
</build>
<dependencies>
+
<!-- compile dependencies -->
+
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
@@ -63,6 +65,14 @@
<artifactId>isis-core-runtime</artifactId>
<scope>compile</scope>
</dependency>
+
+ <!-- TEST -->
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-wrapper</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTest.java b/core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTestUsingJavassist.java
similarity index 87%
rename from core/wrapper/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTest.java
rename to core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTestUsingJavassist.java
index bbdd9a1..fabe6d8 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTest.java
+++ b/core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTestUsingJavassist.java
@@ -23,12 +23,12 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.isis.core.wrapper.handlers.DelegatingInvocationHandler;
-import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class ProxyCreatorTest {
+public class ProxyCreatorTestUsingJavassist {
private ProxyCreator proxyCreator;
@@ -37,6 +37,17 @@ public class ProxyCreatorTest {
proxyCreator = new ProxyCreator();
}
+ @SuppressWarnings("unused")
+ private static class Employee {
+ private String name;
+ public String getName() {
+ return name;
+ }
+ public void setName(final String name) {
+ this.name = name;
+ }
+ }
+
private static class DelegatingInvocationHandlerForTest implements DelegatingInvocationHandler<Employee> {
private final Employee delegate = new Employee();
private final Set<String> invoked = new HashSet<>();
@@ -67,7 +78,7 @@ public class ProxyCreatorTest {
}
@Test
- public void proxyShouldDlegateCalls() {
+ public void proxyShouldDelegateCalls() {
final DelegatingInvocationHandlerForTest handler = new DelegatingInvocationHandlerForTest();
final Employee proxyOfEmployee = proxyCreator.instantiateProxy(handler);
diff --git a/core/pom.xml b/core/pom.xml
index 57fa935..cdafd95 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1440,8 +1440,20 @@ ${license.additional-notes}
<version>${revision}</version>
</dependency>
-
- <!-- plugins -->
+ <!-- core plugins -->
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-codegen-bytebuddy</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-codegen-javassist</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-discovery-reflections</artifactId>
@@ -2396,6 +2408,8 @@ ${license.additional-notes}
<module>mavendeps/webapp</module>
<module>mavendeps/testing</module>
+ <module>plugins/codegen-bytebuddy</module>
+ <module>plugins/codegen-javassist</module>
<module>plugins/discovery-reflections</module>
<module>plugins/eventbus-axon</module>
<module>plugins/eventbus-guava</module>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index c8e5b09..193cc5d 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -1,69 +1,67 @@
-<!--
- 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">
+<!-- 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>
+ <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>
+ <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>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ </dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ </dependency>
+
+ <!-- TEST -->
+
<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>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- </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>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.