You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 11:17:55 UTC
[isis] 06/21: ISIS-2259: adds in parent module for cors extension
module
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 885855899a9a1eeb14ee4c686da51908b8b8e949
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:49:03 2020 +0000
ISIS-2259: adds in parent module for cors extension module
---
extensions/pom.xml | 5 ++--
extensions/vro/cors/impl/pom.xml | 12 ++++----
.../IsisModuleExtCorsImpl.java} | 6 ++--
.../cors/{ => impl}/webmodule/WebModuleCors.java | 2 +-
extensions/vro/cors/{impl => }/pom.xml | 35 ++++++----------------
5 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index d263c93..425bb44 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-cors</artifactId>
+ <artifactId>isis-extensions-cors-impl</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -140,9 +140,8 @@
<modules>
<module>security/secman</module>
<module>security/shiro-realm-ldap</module>
- <module>security/shiro-realm-ldap/impl</module>
- <module>vro/cors/impl</module>
+ <module>vro/cors</module>
<module>vw/exceldownload</module>
<module>vw/pdfjs</module>
diff --git a/extensions/vro/cors/impl/pom.xml b/extensions/vro/cors/impl/pom.xml
index f0297b9..672894a 100644
--- a/extensions/vro/cors/impl/pom.xml
+++ b/extensions/vro/cors/impl/pom.xml
@@ -16,18 +16,16 @@
<parent>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <artifactId>isis-extensions-cors</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-cors</artifactId>
- <name>Apache Isis Ext - CORS</name>
- <description></description>
+ <artifactId>isis-extensions-cors-impl</artifactId>
+ <name>Apache Isis Ext - CORS (impl)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.cors</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/cors</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.cors.impl</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/cors/impl</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/IsisModuleExtCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
similarity index 87%
rename from extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/IsisModuleExtCors.java
rename to extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
index 9916454..d8edba6 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/IsisModuleExtCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.cors;
+package org.apache.isis.extensions.cors.impl;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.cors.webmodule.WebModuleCors;
+import org.apache.isis.extensions.cors.impl.webmodule.WebModuleCors;
@Configuration
@Import({
// @Service's
WebModuleCors.class
})
-public class IsisModuleExtCors {
+public class IsisModuleExtCorsImpl {
}
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/webmodule/WebModuleCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
similarity index 98%
rename from extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/webmodule/WebModuleCors.java
rename to extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
index b81bcb9..3f3d1d4 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/webmodule/WebModuleCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.cors.webmodule;
+package org.apache.isis.extensions.cors.impl.webmodule;
import java.util.List;
diff --git a/extensions/vro/cors/impl/pom.xml b/extensions/vro/cors/pom.xml
similarity index 63%
copy from extensions/vro/cors/impl/pom.xml
copy to extensions/vro/cors/pom.xml
index f0297b9..d7e968f 100644
--- a/extensions/vro/cors/impl/pom.xml
+++ b/extensions/vro/cors/pom.xml
@@ -18,36 +18,19 @@
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-extensions-cors</artifactId>
- <name>Apache Isis Ext - CORS</name>
- <description></description>
+ <name>Apache Isis Ext - CORS (parent)</name>
+ <description>
+ Implementation of CORS Filter (using ebay filter)
+ </description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.cors</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/cors</git-plugin.propertiesDir>
- </properties>
+ <packaging>pom</packaging>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ebaysf.web</groupId>
- <artifactId>cors-filter</artifactId>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>impl</module>
+ </modules>
</project>