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 2018/05/13 14:37:03 UTC
[isis] branch master updated (fca655b -> 80d9ddc)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from fca655b ISIS-1944: Tree View: propagate expand/collapse events to tree's state
new fed4479 ISIS-1946: allows running using o.a.i.WebServer by relaxing validation in _Resource_Path.
new 105b532 ISIS-1810: fixes scm URLs in root pom
new 8238e8b ISIS-1904: fixes configuration of flattened pom's (for externalized version)
new 48f1445 ISIS-1904: removes workaround for flattened poms, since figured out how to configure the flattened pom plugin to correctly resolve dependencies and dependencyManagement sections
new 80d9ddc ISIS-1810: adds missing dependency declarations
The 5 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:
.../applib/internal/resources/_Resource_Path.java | 37 ++++++++----
core/pom.xml | 22 +++++++
example/application/helloworld/pom.xml | 20 +++----
example/application/simpleapp/application/pom.xml | 65 --------------------
.../application/simpleapp/module-simple/pom.xml | 70 +---------------------
example/application/simpleapp/pom.xml | 66 --------------------
example/application/simpleapp/webapp/pom.xml | 34 -----------
pom.xml | 6 +-
8 files changed, 61 insertions(+), 259 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/05: ISIS-1946: allows running using o.a.i.WebServer by
relaxing validation in _Resource_Path.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fed4479b409201634a8218f1c034d6b1f4da8ed5
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 13 15:15:10 2018 +0100
ISIS-1946: allows running using o.a.i.WebServer by relaxing validation in _Resource_Path.
---
.../applib/internal/resources/_Resource_Path.java | 37 ++++++++++++++++------
1 file changed, 27 insertions(+), 10 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_Path.java b/core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_Path.java
index abd19de..fd047d6 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_Path.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_Path.java
@@ -34,15 +34,21 @@ abstract class _Resource_Path {
protected abstract String resourceName();
public _Resource_Path(String contextPath) {
-
- if(_Strings.isEmpty(contextPath))
- throw new IllegalArgumentException(resourceName()+" can not be empty");
-
- contextPath = contextPath.trim();
-
- if(_Strings.isEmpty(contextPath))
- throw new IllegalArgumentException(resourceName()+" can not be empty");
-
+
+// as it stands, this code fails when running under org.apache.isis.WebServer, because the contextPath passed in is just ""
+// But it's not obvious to me why an empty contextPath is not allowed; a value of "/" would be trimmed down to "" anyway.
+// Therefore relaxing the logic.
+//
+// if(_Strings.isEmpty(contextPath))
+// throw new IllegalArgumentException(resourceName()+" can not be empty");
+//
+// contextPath = contextPath.trim();
+//
+// if(_Strings.isEmpty(contextPath))
+// throw new IllegalArgumentException(resourceName()+" can not be empty");
+
+ contextPath = defaultIfEmpty(contextPath);
+
while(contextPath.startsWith("/")) {
contextPath = contextPath.substring(1);
}
@@ -58,5 +64,16 @@ abstract class _Resource_Path {
this.path = contextPath;
}
-
+
+ private static String defaultIfEmpty(final String contextPath) {
+ if(contextPath == null) {
+ return "/";
+ }
+ final String trimmedContextPath = contextPath.trim();
+ if(_Strings.isEmpty(trimmedContextPath)) {
+ return "/";
+ }
+ return trimmedContextPath;
+ }
+
}
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 03/05: ISIS-1904: fixes configuration of flattened pom's
(for externalized version)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8238e8ba6322e5fc987f4edf305514bd89488ec6
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 13 15:16:40 2018 +0100
ISIS-1904: fixes configuration of flattened pom's (for externalized version)
---
core/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/core/pom.xml b/core/pom.xml
index 3d01e23..f215928 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1161,6 +1161,10 @@ ${license.additional-notes}
<version>1.0.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
+ <pomElements>
+ <dependencyManagement>resolve</dependencyManagement>
+ <dependencies>resolve</dependencies>
+ </pomElements>
</configuration>
<executions>
<execution>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/05: ISIS-1810: fixes scm URLs in root pom
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 105b532139898ec4a2abcf504eddf5b328c877e1
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 13 15:15:42 2018 +0100
ISIS-1810: fixes scm URLs in root pom
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index e40ac15..2b56198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@
</description>
<scm>
- <connection>scm:git:http://git.apache.org/isis.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=isis.git</url>
+ <connection>scm:git:https://github.com/apache/isis.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
+ <url>https://github.com/apache/isis.git</url>
<tag>HEAD</tag>
</scm>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 04/05: ISIS-1904: removes workaround for flattened poms,
since figured out how to configure the flattened pom plugin to
correctly resolve dependencies and dependencyManagement sections
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 48f1445e194ea1f7ab4b58d089c50fcedefbbb0e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 13 15:27:47 2018 +0100
ISIS-1904: removes workaround for flattened poms, since figured out how to configure the flattened pom plugin to correctly resolve dependencies and dependencyManagement sections
---
example/application/helloworld/pom.xml | 20 +++----
example/application/simpleapp/application/pom.xml | 65 --------------------
.../application/simpleapp/module-simple/pom.xml | 70 +---------------------
example/application/simpleapp/pom.xml | 66 --------------------
example/application/simpleapp/webapp/pom.xml | 34 -----------
5 files changed, 9 insertions(+), 246 deletions(-)
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index a8ead94..5a2cfad 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -161,45 +161,44 @@
<dependencies>
<!-- ISIS API -->
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
</dependency>
<!-- ISIS CORE PLUGINS -->
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-discovery-reflections</artifactId>
- <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
- <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-eventbus-guava</artifactId>
- <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
- <version>${revision}</version>
</dependency>
-
- <!-- TESTS -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
<type>pom</type>
</dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+
+ <!-- TESTS -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
@@ -207,11 +206,6 @@
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
-
</dependencies>
<profiles>
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 1668f36..7098f15 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -128,69 +128,4 @@
</dependencies>
- <profiles>
- <profile>
- <!--
- The flattened pom plugin seems to interfere with isis-mavendeps-testing type=pom dependency
- This is a workaround for that issue
- -->
- <id>flattened-pom</id>
- <activation>
- <property>
- <name>!skip.flattened-pom</name>
- </property>
- </activation>
- <properties>
- <hamcrest.version>1.3</hamcrest.version>
- <assertj.version>3.6.2</assertj.version>
- <objenesis.version>2.4</objenesis.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <version>${isis.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- <version>${isis.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-specsupport</artifactId>
- <version>${isis.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>${objenesis.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index a5b475b..dc4c7f7 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -34,8 +34,8 @@
domainapp.modules.simple.SimpleModuleManifest
</isis-maven-plugin.validate.appManifest>
- <maven-checkstyle-plugin.configLocation>${project.parent.basedir}/_checks/checkstyle.xml</maven-checkstyle-plugin.configLocation>
- <maven-pmd-plugin.ruleset>${project.parent.basedir}/_checks/pmd.xml</maven-pmd-plugin.ruleset>
+ <maven-checkstyle-plugin.configLocation>../_checks/checkstyle.xml</maven-checkstyle-plugin.configLocation>
+ <maven-pmd-plugin.ruleset>../_checks/pmd.xml</maven-pmd-plugin.ruleset>
</properties>
<build>
@@ -183,7 +183,6 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
@@ -192,69 +191,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <!--
- The flattened pom plugin seems to interfere with isis-mavendeps-testing type=pom dependency
- This is a workaround for that issue
- -->
- <id>flattened-pom</id>
- <activation>
- <property>
- <name>!skip.flattened-pom</name>
- </property>
- </activation>
- <properties>
- <hamcrest.version>1.3</hamcrest.version>
- <assertj.version>3.6.2</assertj.version>
- <objenesis.version>2.4</objenesis.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <version>${isis.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- <version>${isis.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-specsupport</artifactId>
- <version>${isis.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>${objenesis.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 3d68f00..9c95460 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -152,72 +152,6 @@
<profiles>
<profile>
- <!--
- specifying -Drevision means that scope=pom dependencies are not resolved.
- This is a workaround for that issue
- -->
- <id>revision</id>
- <activation>
- <property>
- <name>revision</name>
- </property>
- </activation>
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <version>${revision}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-wrapper</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
- <version>${revision}</version>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-webapp</artifactId>
- <version>${revision}</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.lazyluke</groupId>
- <artifactId>log4jdbc-remix</artifactId>
- <version>${log4jdbc-remix.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
- <properties>
- <log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
- </properties>
- </profile>
- <profile>
<id>m2e</id>
<activation>
<property>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 634e501..498c24d 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -126,40 +126,6 @@
<profiles>
<profile>
- <!--
- The flattened pom plugin seems to interfere with isis-mavendeps-webapp type=pom dependency
- This is a workaround for that issue
- -->
- <id>flattened-pom</id>
- <activation>
- <property>
- <name>!skip.flattened-pom</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security-shiro</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security</artifactId>
- <version>${isis.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>isis-swagger</id>
<activation>
<property>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 05/05: ISIS-1810: adds missing dependency declarations
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 80d9ddcc69fdc7147d1961845a1197d550d04178
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 13 15:29:46 2018 +0100
ISIS-1810: adds missing dependency declarations
---
core/pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/core/pom.xml b/core/pom.xml
index f215928..57fa935 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1450,6 +1450,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-datanucleus-4</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
<version>${revision}</version>
</dependency>
@@ -1462,10 +1468,22 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-eventbus-axon</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
<version>${revision}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jaxrs-resteasy-4</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
<!-- also for benefit of application developers, using scope=import -->
<dependency>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.