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/01/30 14:49:45 UTC
[isis] branch maint-1.16.1 updated (344dcba -> 6c200e3)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 344dcba Merge branch 'ISIS-1569-replay-commands' into maint-1.16.1
new a821fa2 ISIS-1569: removes usage of deprecated annotations in Command iterface
new 6330ef2 ISIS-1826 and ISIS-1856: adds Automatic-Module-Name to manifest, adds git SCM-Revision to manifest, also generates git.properties and adds to jar
new 6c200e3 ISIS-1856: updates incorrect <scm> in (parent) core's pom.xml
The 3 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:
core/applib/pom.xml | 5 ++
.../isis/applib/services/command/Command.java | 40 ++++++-----
core/integtestsupport/pom.xml | 7 +-
core/log4j/pom.xml | 5 ++
core/maven-plugin/pom.xml | 3 +
core/metamodel/pom.xml | 5 ++
core/pom.xml | 80 +++++++++++++++++++---
core/runtime/pom.xml | 17 ++---
.../src/main/resources/META-INF/MANIFEST.MF | 6 --
core/schema/pom.xml | 5 ++
core/security-shiro/pom.xml | 7 +-
core/security/pom.xml | 7 +-
core/specsupport/pom.xml | 5 ++
core/unittestsupport/pom.xml | 7 +-
core/viewer-restfulobjects-applib/pom.xml | 7 +-
core/viewer-restfulobjects-rendering/pom.xml | 8 ++-
core/viewer-restfulobjects-server/pom.xml | 7 +-
core/viewer-wicket-applib/pom.xml | 6 +-
core/viewer-wicket-impl/pom.xml | 6 +-
core/viewer-wicket-model/pom.xml | 5 ++
core/viewer-wicket-ui/pom.xml | 5 ++
core/webserver/pom.xml | 5 ++
core/wrapper/pom.xml | 7 +-
23 files changed, 204 insertions(+), 51 deletions(-)
delete mode 100644 core/runtime/src/main/resources/META-INF/MANIFEST.MF
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 03/03: ISIS-1856: updates incorrect in (parent) core's
pom.xml
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6c200e3fe1e256695db6067aae9354fc4f04bd72
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 30 14:36:18 2018 +0000
ISIS-1856: updates incorrect <scm> in (parent) core's pom.xml
---
core/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index a2bda6e..9bf229f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -188,9 +188,9 @@
</properties>
<scm>
- <connection>scm:git:http://git.apache.org/isis.git/core</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/</developerConnection>
- <url>git://git.apache.org/isis.git/core</url>
+ <connection>scm:git:http://github.com/apache/isis.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
+ <url>http://github.com/apache/isis</url>
<tag>HEAD</tag>
</scm>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/03: ISIS-1826 and ISIS-1856: adds Automatic-Module-Name
to manifest, adds git SCM-Revision to manifest,
also generates git.properties and adds to jar
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6330ef27b547ac05452b004dc4bf1302fba261fb
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 30 14:31:11 2018 +0000
ISIS-1826 and ISIS-1856: adds Automatic-Module-Name to manifest, adds git SCM-Revision to manifest, also generates git.properties and adds to jar
---
core/applib/pom.xml | 5 ++
core/integtestsupport/pom.xml | 7 +-
core/log4j/pom.xml | 5 ++
core/maven-plugin/pom.xml | 3 +
core/metamodel/pom.xml | 5 ++
core/pom.xml | 74 ++++++++++++++++++++--
core/runtime/pom.xml | 17 ++---
.../src/main/resources/META-INF/MANIFEST.MF | 6 --
core/schema/pom.xml | 5 ++
core/security-shiro/pom.xml | 7 +-
core/security/pom.xml | 7 +-
core/specsupport/pom.xml | 5 ++
core/unittestsupport/pom.xml | 7 +-
core/viewer-restfulobjects-applib/pom.xml | 7 +-
core/viewer-restfulobjects-rendering/pom.xml | 8 ++-
core/viewer-restfulobjects-server/pom.xml | 7 +-
core/viewer-wicket-applib/pom.xml | 6 +-
core/viewer-wicket-impl/pom.xml | 6 +-
core/viewer-wicket-model/pom.xml | 5 ++
core/viewer-wicket-ui/pom.xml | 5 ++
core/webserver/pom.xml | 5 ++
core/wrapper/pom.xml | 7 +-
22 files changed, 177 insertions(+), 32 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 07e7ddf..94a15de 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -34,6 +34,11 @@
default (Java) programming model.
</description>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.applib</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/applib</gitPropertiesDir>
+ </properties>
+
<build>
<resources>
<resource>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 3e066f1..54b2c15 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -29,7 +29,12 @@
<artifactId>isis-core-integtestsupport</artifactId>
<name>Apache Isis Integration Testing Support</name>
- <dependencies>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core.integtestsupport</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core/integtestsupport</gitPropertiesDir>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index a42e4ae..8aad383 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -21,6 +21,11 @@
<artifactId>isis-core-log4j</artifactId>
<name>Apache Isis Log4j Impls</name>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core.log4j</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core/log4j</gitPropertiesDir>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 7b4e3b7..9dc2dba 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -41,6 +41,9 @@
</prerequisites>
<properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.tool.mavenplugin</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/tool/mavenplugin</gitPropertiesDir>
+
<maven-core.version>3.3.9</maven-core.version>
<maven-project.version>3.0-alpha-2</maven-project.version>
<maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 943236a..1587f5f 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -29,6 +29,11 @@
<artifactId>isis-core-metamodel</artifactId>
<name>Apache Isis MetaModel</name>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core.metamodel</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core/metamodel</gitPropertiesDir>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 9d604ba..a2bda6e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -50,6 +50,9 @@
</prerequisites>
<properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core</gitPropertiesDir>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -63,8 +66,10 @@
<dependency.locations.enabled>false</dependency.locations.enabled>
<coreBaseDir>${project.build.directory}/..</coreBaseDir>
- <checkstyle.configLocation>${coreBaseDir}/src/site/resources/codequality/checkstyle.xml</checkstyle.configLocation>
- <pmd.ruleset>${coreBaseDir}/src/site/resources/codequality/pmd.xml</pmd.ruleset>
+ <checkstyle.configLocation>${coreBaseDir}/codequality/checkstyle.xml</checkstyle.configLocation>
+ <pmd.ruleset>${coreBaseDir}/codequality/pmd.xml</pmd.ruleset>
+ <gitDir>${coreBaseDir}/../.git</gitDir>
+ <git.commit.id>UNKNOWN</git.commit.id>
<projectUrl>${project.url}</projectUrl>
@@ -186,8 +191,8 @@
<connection>scm:git:http://git.apache.org/isis.git/core</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/</developerConnection>
<url>git://git.apache.org/isis.git/core</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<url>http://isis.apache.org</url>
@@ -776,6 +781,39 @@
</plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>2.2.3</version>
+ <executions>
+ <execution>
+ <id>get-the-git-infos</id>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+
+ <configuration>
+ <verbose>false</verbose>
+ <dotGitDirectory>${gitDir}</dotGitDirectory>
+
+ <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+ <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
+
+ <failOnNoGitDirectory>true</failOnNoGitDirectory>
+ <injectAllReactorProjects>true</injectAllReactorProjects>
+
+ <generateGitPropertiesFile>true</generateGitPropertiesFile>
+ <generateGitPropertiesFilename>${project.build.outputDirectory}/${gitPropertiesDir}/git.properties</generateGitPropertiesFilename>
+
+ <abbrevLength>7</abbrevLength>
+ </configuration>
+
+ </plugin>
+
+
<!-- Packaging: jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -791,8 +829,30 @@
<goals>
<goal>test-jar</goal>
</goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
</execution>
</executions>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Automatic-Module-Name>${jar-plugin.automaticModuleName.jar}</Automatic-Module-Name>
+ <Implementation-Vendor-Id>org.apache.isis</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Isis™ Project</Implementation-Vendor>
+ <SCM-Revision>${git.commit.id.abbrev}</SCM-Revision>
+ </manifestEntries>
+ </archive>
+ </configuration>
</plugin>
@@ -984,7 +1044,6 @@
</pluginManagement>
-
<!-- build plugins; apply to all inheriting modules. Note that some
plugins also come from the "super-POM" for the default bindings. For example,
in the 'default' lifecycle, the resources, compiler, surefire, jar, install
@@ -1002,6 +1061,11 @@
</plugin>
<plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ </plugin>
+
+ <plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 731e37a..2fa2095 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -29,7 +29,12 @@
<artifactId>isis-core-runtime</artifactId>
<name>Apache Isis Runtime</name>
- <build>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core.runtime</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core/runtime</gitPropertiesDir>
+ </properties>
+
+ <build>
<resources>
<resource>
<directory>src/main/java</directory>
@@ -54,16 +59,6 @@
</resource>
</resources>
<plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/core/runtime/src/main/resources/META-INF/MANIFEST.MF b/core/runtime/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 92bc478..0000000
--- a/core/runtime/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Isis JDO ObjectStore DataNucleus Implementation
-Bundle-SymbolicName: org.apache.isis.objectstore.jdo.datanucleus
-Bundle-Version: 1.0.0
-Bundle-Vendor: Apache Isis
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index cc2a0b9..7df40c7 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -34,6 +34,11 @@
Apache Isis schemas, for conversion into canonical DTOs (for use in integration scenarios).
</description>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.schema</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/schema</gitPropertiesDir>
+ </properties>
+
<dependencies>
<dependency>
<groupId>joda-time</groupId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 80d5264..d38086d 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -26,12 +26,17 @@
<version>1.16.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
<version>1.16.1-SNAPSHOT</version>
<name>Apache Isis Security Shiro</name>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.security.shiro</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/security/shiro</gitPropertiesDir>
+ </properties>
+
+
<build>
<pluginManagement>
<plugins>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index ae62c3b..90295d4 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -27,7 +27,12 @@
</parent>
<artifactId>isis-core-security</artifactId>
- <name>Apache Isis Security Bypass</name>
+ <name>Apache Isis Security + Bypass</name>
+
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core.security</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core/security</gitPropertiesDir>
+ </properties>
<dependencies>
<dependency>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 51d29d6..9c6554a 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -21,6 +21,11 @@
<artifactId>isis-core-specsupport</artifactId>
<name>Apache Isis Spec Support</name>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core.specsupport</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core/specsupport</gitPropertiesDir>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 8d89539..e49bd01 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -29,7 +29,12 @@
<artifactId>isis-core-unittestsupport</artifactId>
<name>Apache Isis Unit Test Support</name>
- <description>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core.unittestsupport</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core/unittestsupport</gitPropertiesDir>
+ </properties>
+
+ <description>
Support for writing unit tests; should be added as a dependency
with scope=test only
</description>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index c5cc31f..e3db8a3 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -29,7 +29,12 @@
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
<name>Apache Isis RestfulObjects Viewer AppLib</name>
- <dependencies>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.viewer.restfulobjects.applib</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/viewer/restfulobjects/applib</gitPropertiesDir>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index ab1187d..8918c39 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -30,7 +30,13 @@
<name>Apache Isis RestfulObjects Viewer Rendering</name>
- <dependencies>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.viewer.restfulobjects.rendering</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/viewer/restfulobjects/rendering</gitPropertiesDir>
+ </properties>
+
+
+ <dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 6ac2c84..83514cb 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -30,7 +30,12 @@
<name>Apache Isis RestfulObjects Viewer Server</name>
- <dependencies>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.viewer.restfulobjects.server</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/viewer/restfulobjects/server</gitPropertiesDir>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 58cdfdf..df0c06c 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -27,10 +27,14 @@
<version>1.16.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
<name>Apache Isis Wicket Viewer Applib</name>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.viewer.wicket.applib</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/viewer/wicket/applib</gitPropertiesDir>
+ </properties>
+
<build>
<resources>
<resource>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 99348c4..29e119c 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -29,9 +29,13 @@
<name>Apache Isis Wicket Viewer Implementation</name>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.viewer.wicket.impl</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/viewer/wicket/impl</gitPropertiesDir>
+ </properties>
+
<build>
<resources>
<resource>
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index f21db87..c8683da 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -30,6 +30,11 @@
<artifactId>isis-core-viewer-wicket-model</artifactId>
<name>Apache Isis Wicket Viewer Model</name>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.viewer.wicket.model</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/viewer/wicket/model</gitPropertiesDir>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index e207edf..7cc9712 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -30,6 +30,11 @@
<artifactId>isis-core-viewer-wicket-ui</artifactId>
<name>Apache Isis Wicket Viewer UI Components</name>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.viewer.wicket.ui</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/viewer/wicket/ui</gitPropertiesDir>
+ </properties>
+
<build>
<resources>
<resource>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 47414e9..bc96415 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -29,6 +29,11 @@
<artifactId>isis-core-webserver</artifactId>
<name>Apache Isis WebServer</name>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core.webserver</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core/webserver</gitPropertiesDir>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 4276742..763b986 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -30,7 +30,12 @@
<name>Apache Isis Wrapper Service</name>
- <dependencies>
+ <properties>
+ <jar-plugin.automaticModuleName.jar>org.apache.isis.core.wrapper</jar-plugin.automaticModuleName.jar>
+ <gitPropertiesDir>org/apache/isis/core/wrapper</gitPropertiesDir>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/03: ISIS-1569: removes usage of deprecated annotations in
Command iterface
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a821fa2b4432f0f2231eb0039827023a518e0c22
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 30 11:44:29 2018 +0000
ISIS-1569: removes usage of deprecated annotations in Command iterface
---
.../isis/applib/services/command/Command.java | 40 +++++++++++++---------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
index ec91580..0ae75e1 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
@@ -22,7 +22,6 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Command.ExecuteIn;
import org.apache.isis.applib.annotation.Command.Persistence;
-import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.HasTransactionId;
@@ -278,7 +277,7 @@ public interface Command extends HasTransactionId {
//endregion
- //region > startedAt (property, deprecated)
+ //region > startedAt (property)
/**
* For an command that has actually been executed, holds the date/time at which the {@link Interaction} that
@@ -286,8 +285,8 @@ public interface Command extends HasTransactionId {
*
* <p>
* Previously this field was deprecated (on the basis that the startedAt is also held in
- * {@link Interaction.Execution#getStartedAt()}). However, to support replay/replication feature means that
- * we need to query for persisted {@link Command}s and use this field to ensure the correct ordering.
+ * {@link Interaction.Execution#getStartedAt()}). However, this property is now used in master/slave
+ * replay scenarios which may query a persisted Command.
* </p>
*
* See also {@link Interaction#getCurrentExecution()} and
@@ -301,8 +300,8 @@ public interface Command extends HasTransactionId {
*
* <p>
* Previously this field was deprecated (on the basis that the completedAt is also held in
- * {@link Interaction.Execution#getCompletedAt()}). However, to support replay/replication feature means that
- * we need to query for persisted {@link Command}s and use this field to ensure the correct ordering.
+ * {@link Interaction.Execution#getCompletedAt()}). However, this property is now used in master/slave
+ * replay scenarios which may query a persisted Command.
* </p>
*
* See also {@link Interaction#getCurrentExecution()} and
@@ -320,8 +319,8 @@ public interface Command extends HasTransactionId {
*
* <p>
* Previously this field was deprecated (on the basis that the completedAt is also held in
- * {@link Interaction.Execution#getCompletedAt()}). However, to support replay/replication feature means that
- * we need to query for persisted {@link Command}s and use this field to ensure the correct ordering.
+ * {@link Interaction.Execution#getCompletedAt()}). However, this property is now used in master/slave
+ * replay scenarios which may query a persisted Command.
* </p>
*
* See also {@link Interaction#getCurrentExecution()} and
@@ -334,8 +333,8 @@ public interface Command extends HasTransactionId {
*
* <p>
* Previously this field was deprecated (on the basis that the completedAt is also held in
- * {@link Interaction.Execution#getCompletedAt()}). However, to support replay/replication feature means that
- * we need to query for persisted {@link Command}s and use this field to ensure the correct ordering.
+ * {@link Interaction.Execution#getCompletedAt()}). However, this property is now used in master/slave
+ * replay scenarios which may query a persisted Command.
* </p>
*
* See also {@link Interaction#getCurrentExecution()} and
@@ -366,10 +365,14 @@ public interface Command extends HasTransactionId {
* For an command that has actually been executed, holds the exception stack
* trace if the action invocation/property modification threw an exception.
*
- * @deprecated - see {@link Interaction#getCurrentExecution()} and {@link org.apache.isis.applib.services.iactn.Interaction.Execution#getThrew()} instead.
+ * <p>
+ * Previously this field was deprecated (on the basis that the exception is also held in
+ * {@link Interaction.Execution#getThrew()}). However, this property is now used in master/slave
+ * replay scenarios which may query a persisted Command.
+ * </p>
+ *
+ * See also {@link Interaction#getCurrentExecution()} and {@link org.apache.isis.applib.services.iactn.Interaction.Execution#getThrew()}.
*/
- @Deprecated
- @Optional
String getException();
/**
@@ -384,10 +387,15 @@ public interface Command extends HasTransactionId {
/**
* For an command that has actually been executed, holds a {@link Bookmark} to the object returned by the corresponding action/property modification.
- *
- * @deprecated - see {@link Interaction#getCurrentExecution()} and {@link org.apache.isis.applib.services.iactn.Interaction.Execution#getReturned()} instead.
+ *
+ * <p>
+ * Previously this field was deprecated (on the basis that the returned value is also held in
+ * {@link Interaction.Execution#getReturned()}). However, this property is now used in master/slave
+ * replay scenarios which may query a persisted Command.
+ * </p>
+ *
+ * See also {@link Interaction#getCurrentExecution()} and {@link org.apache.isis.applib.services.iactn.Interaction.Execution#getReturned()}.
*/
- @Deprecated
Bookmark getResult();
/**
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.