isis git commit: ISIS-1335: updating the release notes for 1.13.0
Repository: isis Updated Branches: refs/heads/release-1.13.0-RC1 a7e2e025e -> 3af3ab328 ISIS-1335: updating the release notes for 1.13.0 Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3af3ab32 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3af3ab32 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3af3ab32 Branch: refs/heads/release-1.13.0-RC1 Commit: 3af3ab328e20196c691684fdcc1d07615566a23e Parents: a7e2e02 Author: Dan Haywood Authored: Fri Jul 8 11:14:13 2016 +0100 Committer: Dan Haywood Committed: Fri Jul 8 11:14:13 2016 +0100 -- .../main/asciidoc/_release-notes_1.13.0.adoc| 152 +++ .../src/main/asciidoc/release-notes.adoc| 10 ++ 2 files changed, 162 insertions(+) -- http://git-wip-us.apache.org/repos/asf/isis/blob/3af3ab32/adocs/documentation/src/main/asciidoc/_release-notes_1.13.0.adoc -- diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.13.0.adoc b/adocs/documentation/src/main/asciidoc/_release-notes_1.13.0.adoc new file mode 100644 index 000..0d28078 --- /dev/null +++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.13.0.adoc @@ -0,0 +1,152 @@ +[[r1.13.0]] += 1.13.0 +:notice: 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. +:_basedir: ./ +:_imagesdir: images/ +:toc: right + + +[NOTE] + +Apache Isis 1.13.0 is not yet released (is still formally `1.13.0-SNAPSHOT`), but voting for RC1 is currently underway. + + +Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an +interaction. A command now represents the _intention_ to interact with the application, either to invoke an action or +to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a +command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions, +representing the fact that an action can invoke another action by way of the +xref:rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`]. + +The existing xref:rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] and +xref:rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`] SPI services have both been deprecated, instead +replaced by xref:rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`] and +xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`]. It is now possible to have multiple implementations +of each. + +The (non-ASF) http://github.com/isisaddons/isis-module-auditing[Isis addons' auditing] module has been reworked to +implement xref:rgsvc.adoc#_rgsvc_spi_AuditService[`AuditService`], while the new (non-ASF) +http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module implements +xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`] to publish interaction events to an ActiveMQ bus (and +to allow such events to be replayed if necessary). + +The release also includes a great deal of internal refactorings and simplifications. + + + + +== New Feature + +* link:https://issues.apache.org/jira/browse/ISIS-1446[ISIS-1446] - Extend the Wicket viewer client-side file-open-dialog to allow file extension to be specified. +* link:https://issues.apache.org/jira/browse/ISIS-1433[ISIS-1433] - New configuration option to allow a minimum/maximum date to be specified for date pickers. +* link:https://issues.apache.org/jira/browse/ISIS-1421[ISIS-1421] - Possible object deadlock when under load. +* link:https://issues.apache.org/jira/browse/ISIS-1420[ISIS-1420] - To support dockerization, have any overrides.properties file take precedence over any other config properties +* link:https://issues.apache.org/jira/browse/ISIS-1418[ISIS-1418] - Support @Nullable for parameters and properties +* link:https://issues.apache.org/jira/browse/ISIS-1413[ISIS-1413] - Gradle script (and docs) in simpleapp archetype to auto-enhance and for dynamic layouts, also liveReload +* link:https://issues.apache.org/jira/browse/ISIS-139
[isis] Git Push Summary
Repository: isis Updated Tags: refs/tags/simpleapp-archetype-1.13.0-RC1 [created] 91e44c2de
[isis] Git Push Summary
Repository: isis Updated Tags: refs/tags/isis-1.13.0-RC1 [created] 7f166ec72
[01/11] isis git commit: ISIS-1335: adding missing license headers.
Repository: isis
Updated Branches:
refs/heads/release-1.13.0-RC1 [created] a7e2e025e
ISIS-1335: adding missing license headers.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e63aa87b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e63aa87b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e63aa87b
Branch: refs/heads/release-1.13.0-RC1
Commit: e63aa87b6670ee78dace3ba4ee50fdb92ac59666
Parents: 2877b18
Author: Dan Haywood
Authored: Thu Jul 7 21:59:01 2016 +0100
Committer: Dan Haywood
Committed: Thu Jul 7 21:59:01 2016 +0100
--
.../fixturescripts/FixtureResult.layout.xml | 18 +++
.../services/audit/AuditerServiceLogging.java | 32
.../config/ConfigurationProperty.layout.xml | 18 +++
...yFacetForPropertyAnnotationAsConfigured.java | 18 +++
.../MessageBrokerServiceInternalNoop.java | 18 +++
.../PersistenceSessionServiceInternalNoop.java | 22 --
.../TransactionStateProviderInternalNoop.java | 18 +++
7 files changed, 136 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/e63aa87b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.layout.xml
--
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.layout.xml
b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.layout.xml
index b41805b..7e7a825 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.layout.xml
+++
b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.layout.xml
@@ -1,4 +1,22 @@
+
http://isis.apache.org/applib/layout/component
http://isis.apache.org/applib/layout/component/component.xsd
http://isis.apache.org/applib/layout/grid/bootstrap3
http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd";
xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3";
xmlns:cpt="http://isis.apache.org/applib/layout/component";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
http://git-wip-us.apache.org/repos/asf/isis/blob/e63aa87b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
--
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
index e395661..7cb27bd 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
@@ -1,15 +1,35 @@
+/*
+ * 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.
+ */
package org.apache.isis.applib.services.audit;
+import java.sql.Timestamp;
+import java.util.UUID;
+
+import javax.annotation.PostConstruct;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.PostConstruct;
-import java.sql.Timestamp;
-import java.util.UUID;
@DomainService(nature = NatureOfService.DOMAIN)
public class AuditerServiceLogging implements AuditerService {
http://git-wip-us.apache.org/repos/asf/isis/blob/e63aa87b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml
--
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml
b/core/applib/src/main/java/org/apache/isis/applib/services
[05/11] isis git commit: ISIS-1335: fixing RAT issues for archetype
ISIS-1335: fixing RAT issues for archetype Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/73e657c4 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/73e657c4 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/73e657c4 Branch: refs/heads/release-1.13.0-RC1 Commit: 73e657c47b68048f2f3db06c39c43eb5ba6c6c10 Parents: 58eb2cd Author: Dan Haywood Authored: Fri Jul 8 06:30:06 2016 +0100 Committer: Dan Haywood Committed: Fri Jul 8 06:33:07 2016 +0100 -- core/pom.xml | 9 + example/application/simpleapp/dom/build.gradle | 19 +++ example/application/simpleapp/dom/layouts.gradle | 19 +++ .../application/simpleapp/dom/liveReload.gradle | 19 +++ example/application/simpleapp/pom.xml| 2 +- .../projects/basic/archetype.properties | 5 - .../src/test/resources/projects/basic/goal.txt | 0 7 files changed, 67 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 6564bf4..7ae6ee3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -485,6 +485,8 @@ **/test.data **/fixture-data/** +**/application.js + **/jquery.zclip.js **/bootstrap-growl.js **/moment.js @@ -497,6 +499,13 @@ **/src/main/appended-resources/supplemental-models.xml **/datanucleus.log + **/gradle/wrapper/gradle-wrapper.properties +**/gradlew +**/gradlew.bat +**/rebel.xml +**/translations**.po +**/integtests/translations.pot +**/intellij/launch/*.xml http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/example/application/simpleapp/dom/build.gradle -- diff --git a/example/application/simpleapp/dom/build.gradle b/example/application/simpleapp/dom/build.gradle index 97b290d..bc75138 100644 --- a/example/application/simpleapp/dom/build.gradle +++ b/example/application/simpleapp/dom/build.gradle @@ -1,5 +1,24 @@ / // +// 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. +// +/ +// // this gradle script compiles and enhances the dom classes. // // The script is intended to be used in conjunction with IntelliJ IDEA, to remove the necessity to run the DataNucleus http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/example/application/simpleapp/dom/layouts.gradle -- diff --git a/example/application/simpleapp/dom/layouts.gradle b/example/application/simpleapp/dom/layouts.gradle index 7fa9267..f5fa30d 100644 --- a/example/application/simpleapp/dom/layouts.gradle +++ b/example/application/simpleapp/dom/layouts.gradle @@ -1,5 +1,24 @@ / // +// 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 +//
[06/11] isis git commit: [maven-release-plugin] prepare release isis-1.13.0
[maven-release-plugin] prepare release isis-1.13.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/08041754
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/08041754
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/08041754
Branch: refs/heads/release-1.13.0-RC1
Commit: 080417548d340e6fa747528caf0ed34ac7024dcd
Parents: 73e657c
Author: Dan Haywood
Authored: Fri Jul 8 06:59:05 2016 +0100
Committer: Dan Haywood
Committed: Fri Jul 8 06:59:05 2016 +0100
--
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml| 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml| 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 66 +++
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +--
core/security/pom.xml| 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml| 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml| 2 +-
core/viewer-wicket-applib/pom.xml| 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
core/viewer-wicket-model/pom.xml | 2 +-
core/viewer-wicket-ui/pom.xml| 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
21 files changed, 55 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/08041754/core/applib/pom.xml
--
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 0cb4415..2bed052 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.13.0-SNAPSHOT
+1.13.0
isis-core-applib
http://git-wip-us.apache.org/repos/asf/isis/blob/08041754/core/integtestsupport/pom.xml
--
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 07343b5..dd53b09 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.13.0-SNAPSHOT
+1.13.0
isis-core-integtestsupport
http://git-wip-us.apache.org/repos/asf/isis/blob/08041754/core/log4j/pom.xml
--
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index bd34f81..1969b69 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
org.apache.isis.core
isis
-1.13.0-SNAPSHOT
+1.13.0
isis-core-log4j
http://git-wip-us.apache.org/repos/asf/isis/blob/08041754/core/maven-plugin/pom.xml
--
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 3a56e4b..f2725b9 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.13.0-SNAPSHOT
+1.13.0
org.apache.isis.tool
http://git-wip-us.apache.org/repos/asf/isis/blob/08041754/core/metamodel/pom.xml
--
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index ff7ef27..2423032 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.13.0-SNAPSHOT
+1.13.0
isis-core-metamodel
http://git-wip-us.apache.org/repos/asf/isis/blob/08041754/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 7ae6ee3..2eae06b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
org.apache.isis.core
isis
-1.13.0-SNAPSHOT
+1.13.0
pom
@@ -186,7 +186,7 @@
scm:git:http://git.apache.org/isis.git/core
scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/
git://git.apache.org/isis.git/core
- HEAD
+ isis-1.13.0
http://isis.apache.org
@@ -1082,13 +1082,13 @@ ${license.additional-notes}
org.apache.isis.core
isis-core-unittestsupport
-1.13.0-SNAPSHOT
+1.13.0
[04/11] isis git commit: ISIS-1335: recreating simpleapp archetype
ISIS-1335: recreating simpleapp archetype Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/58eb2cd5 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/58eb2cd5 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/58eb2cd5 Branch: refs/heads/release-1.13.0-RC1 Commit: 58eb2cd51bf4700d762c705eaf6621113106d695 Parents: e63aa87 Author: Dan Haywood Authored: Fri Jul 8 06:19:40 2016 +0100 Committer: Dan Haywood Committed: Fri Jul 8 06:32:50 2016 +0100 -- example/archetype/simpleapp/pom.xml | 6 +- .../META-INF/maven/archetype-metadata.xml | 29 ++ .../services/homepage/HomePageViewModel.java| 6 +- .../archetype-resources/dom/.gitignore | 3 + .../archetype-resources/dom/build.gradle| 72 .../dom/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53556 bytes .../gradle/wrapper/gradle-wrapper.properties| 9 + .../resources/archetype-resources/dom/gradlew | 164 .../archetype-resources/dom/gradlew.bat | 90 + .../archetype-resources/dom/layouts.gradle | 49 +++ .../archetype-resources/dom/liveReload.gradle | 56 +++ .../domainapp/dom/DomainAppDomManifest.java | 2 +- .../java/domainapp/dom/simple/SimpleObject.java | 95 +++-- .../dom/simple/SimpleObject.layout.xml | 5 +- .../domainapp/dom/simple/SimpleObjectMenu.java | 80 .../dom/simple/SimpleObjectRepository.java | 61 +++ .../domainapp/dom/simple/SimpleObjects.java | 115 -- .../dom/simple/SimpleObjectRepositoryTest.java | 128 ++ .../domainapp/dom/simple/SimpleObjectsTest.java | 107 - .../fixture/dom/simple/SimpleObjectCreate.java | 6 +- .../scenarios/RecreateSimpleObjects.java| 2 + .../bootstrap/DomainAppSystemInitializer.java | 17 +- .../modules/simple/SimpleObjectGlue.java| 6 +- .../modules/simple/SimpleObjectIntegTest.java | 142 --- .../simple/SimpleObjectMenu_IntegTest.java | 149 +++ .../modules/simple/SimpleObject_IntegTest.java | 156 .../modules/simple/SimpleObjectsIntegTest.java | 146 --- .../main/resources/archetype-resources/pom.xml | 2 +- .../archetype-resources/webapp/pom.xml | 21 +- .../WEB-INF/authentication_shiro.properties | 28 ++ .../src/main/webapp/WEB-INF/isis.properties | 36 +- .../src/main/webapp/WEB-INF/logging.properties | 23 +- .../WEB-INF/persistor_datanucleus.properties| 3 +- .../src/main/webapp/WEB-INF/translations-en.po | 391 +++--- .../src/main/webapp/WEB-INF/translations-es.po | 399 --- .../src/main/webapp/WEB-INF/translations-nl.po | 398 +++--- .../src/main/webapp/WEB-INF/translations.po | 391 +++--- .../webapp/WEB-INF/viewer_wicket.properties | 38 +- .../webapp/src/main/webapp/WEB-INF/web.xml | 41 +- .../projects/basic/archetype.properties | 2 +- 40 files changed, 2329 insertions(+), 1145 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/58eb2cd5/example/archetype/simpleapp/pom.xml -- diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index 2195a60..5a9a05c 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -29,14 +29,14 @@ org.apache.maven.archetype archetype-packaging -2.4 +2.2 maven-archetype-plugin -2.4 +2.2 @@ -44,7 +44,7 @@ org.apache.isis.core isis -1.13.0-SNAPSHOT +1.13.0 ../../../core/pom.xml http://git-wip-us.apache.org/repos/asf/isis/blob/58eb2cd5/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml -- diff --git a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml index ef9a445..a13adb7 100644 --- a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -61,17 +61,46 @@ +src/main/resources + +**/*.xml + + + src/test/java **/*.java
[07/11] isis git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bfddbb82
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bfddbb82
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bfddbb82
Branch: refs/heads/release-1.13.0-RC1
Commit: bfddbb820d64582bbb6edf130bbb5782e9215d91
Parents: 0804175
Author: Dan Haywood
Authored: Fri Jul 8 06:59:08 2016 +0100
Committer: Dan Haywood
Committed: Fri Jul 8 06:59:08 2016 +0100
--
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml| 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml| 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 66 +++
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +--
core/security/pom.xml| 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml| 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml| 2 +-
core/viewer-wicket-applib/pom.xml| 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
core/viewer-wicket-model/pom.xml | 2 +-
core/viewer-wicket-ui/pom.xml| 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
21 files changed, 55 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/bfddbb82/core/applib/pom.xml
--
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 2bed052..7e93ae8 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.13.0
+1.14.0-SNAPSHOT
isis-core-applib
http://git-wip-us.apache.org/repos/asf/isis/blob/bfddbb82/core/integtestsupport/pom.xml
--
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index dd53b09..a834871 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.13.0
+1.14.0-SNAPSHOT
isis-core-integtestsupport
http://git-wip-us.apache.org/repos/asf/isis/blob/bfddbb82/core/log4j/pom.xml
--
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 1969b69..41fa92b 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
org.apache.isis.core
isis
-1.13.0
+1.14.0-SNAPSHOT
isis-core-log4j
http://git-wip-us.apache.org/repos/asf/isis/blob/bfddbb82/core/maven-plugin/pom.xml
--
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index f2725b9..99ff1a2 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.13.0
+1.14.0-SNAPSHOT
org.apache.isis.tool
http://git-wip-us.apache.org/repos/asf/isis/blob/bfddbb82/core/metamodel/pom.xml
--
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 2423032..69be87e 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.13.0
+1.14.0-SNAPSHOT
isis-core-metamodel
http://git-wip-us.apache.org/repos/asf/isis/blob/bfddbb82/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 2eae06b..3f45024 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
org.apache.isis.core
isis
-1.13.0
+1.14.0-SNAPSHOT
pom
@@ -186,7 +186,7 @@
scm:git:http://git.apache.org/isis.git/core
scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/
git://git.apache.org/isis.git/core
- isis-1.13.0
+ HEAD
http://isis.apache.org
@@ -1082,13 +1082,13 @@ ${license.additional-notes}
org.apache.isis.core
isis-core-unittestsupport
-1.13.0
+1.14.0-SNAPSHOT
[10/11] isis git commit: [maven-release-plugin] prepare release simpleapp-archetype-1.13.0
[maven-release-plugin] prepare release simpleapp-archetype-1.13.0 Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/15469e2d Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/15469e2d Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/15469e2d Branch: refs/heads/release-1.13.0-RC1 Commit: 15469e2d09320a375b27abb4bb209f2f5c3adbb3 Parents: 81017f8 Author: Dan Haywood Authored: Fri Jul 8 10:43:59 2016 +0100 Committer: Dan Haywood Committed: Fri Jul 8 10:43:59 2016 +0100 -- example/archetype/simpleapp/pom.xml | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/15469e2d/example/archetype/simpleapp/pom.xml -- diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index 5a9a05c..af76b76 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -17,11 +17,11 @@ specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> +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/xsd/maven-4.0.0.xsd";> 4.0.0 org.apache.isis.archetype simpleapp-archetype -1.13.0-SNAPSHOT +1.13.0 maven-archetype simpleapp-archetype @@ -47,4 +47,8 @@ 1.13.0 ../../../core/pom.xml + + +simpleapp-archetype-1.13.0 +
[02/11] isis git commit: ISIS-1335: recreating simpleapp archetype
http://git-wip-us.apache.org/repos/asf/isis/blob/58eb2cd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po -- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po index f8a455b..adae60c 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po @@ -1,21 +1,18 @@ -## -# -# .pot file -# -# Translate this file to each required language and place in WEB-INF, eg: -# -# /WEB-INF/translations-en_US.po -# /WEB-INF/translations-en.po -# /WEB-INF/translations-fr_FR.po -# /WEB-INF/translations-fr.po -# /WEB-INF/translations.po -# -# If the app uses TranslatableString (eg for internationalized validation -# messages), or if the app calls the TranslationService directly, then ensure -# that all text to be translated has been captured by running a full -# integration test suite that exercises all relevant behaviour -# -## +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: 2016-06-16 15:34:40+\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + + +#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel(java.lang.String) +msgid ".csv file name" +msgstr "" + #: org.apache.isis.core.metamodel.services.jdosupport.Persistable_downloadJdoMetadata#$$(java.lang.String) msgid ".jdo file name" @@ -27,26 +24,42 @@ msgid ".pot file name" msgstr "" -#: org.apache.isis.core.runtime.system.IsisSystem +#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#ACTION +msgid "Action" +msgstr "" + + +#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder msgid "Are you sure?" msgstr "" #: org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage msgid "AutoLabel.CSS.required" -msgstr "Required" +msgstr "" -#: org.apache.isis.core.runtime.system.IsisSystem +#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder msgid "Cancel" msgstr "" +#: domainapp.app.services.homepage.HomePageViewModel#clearHints() +#: domainapp.dom.simple.SimpleObject#clearHints() +msgid "Clear Hints" +msgstr "" + + #: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#resetTranslationCache() msgid "Clear translation cache" msgstr "" +#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#COLLECTION +msgid "Collection" +msgstr "" + + #: org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage msgid "CollectionContentsAsAjaxTablePanelFactory.Table" msgstr "Table" @@ -57,7 +70,17 @@ msgid "CollectionContentsAsUnresolvedPanel.Hide" msgstr "Hide" -#: org.apache.isis.core.runtime.system.IsisSystem +#: org.apache.isis.applib.services.layout.LayoutService$Style#COMPLETE +msgid "Complete" +msgstr "" + + +#: org.apache.isis.applib.services.config.ConfigurationServiceMenu#configuration() +msgid "Configuration" +msgstr "" + + +#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder msgid "Confirm" msgstr "" @@ -67,24 +90,34 @@ msgid "Create" msgstr "" +#: org.apache.isis.applib.services.layout.LayoutService$Style#CURRENT +msgid "Current" +msgstr "" + + #: domainapp.dom.simple.SimpleObject#delete() msgid "Delete" msgstr "" -#: domainapp.fixture.scenarios.RecreateSimpleObjects#discoverable -#: org.apache.isis.applib.fixturescripts.FixtureScript#discoverable -msgid "Discoverable" +#: domainapp.dom.simple.SimpleObject#downloadJdoMetadata() +msgid "Download Jdo Metadata" +msgstr "" + + +#: domainapp.app.services.homepage.HomePageViewModel#downloadLayoutXml() +#: domainapp.dom.simple.SimpleObject#downloadLayoutXml() +msgid "Download Layout Xml" msgstr "" -#: org.apache.isis.applib.fixtures.FixtureType#DOMAIN_OBJECTS -msgid "Domain Objects" +#: org.apache.isis.applib.services.layout.LayoutServiceMenu#downloadLayouts() +msgid "Download Layouts (XML)" msgstr "" -#: domainapp.dom.simple.SimpleObject#downloadJdoMetadata() -msgid "Download Jdo Metadata" +#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel() +msgid "Download Meta Model (CSV)" msgstr "" @@ -98,6 +131,12 @@ msgid "Download Translations" msgstr "" +#: org.apache.isis.applib.services.dto.Dto_downloadXml#$$(java.lang.String) +#: org.apache.isis.applib.services.dto.Dto_downloadXsd#$$(java.lang.
[08/11] isis git commit: ISIS-1335: reinstates 'delete' action, had been removed from SimpleObject
ISIS-1335: reinstates 'delete' action, had been removed from SimpleObject
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bd0fef2b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bd0fef2b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bd0fef2b
Branch: refs/heads/release-1.13.0-RC1
Commit: bd0fef2b7ce95fc1466418b74da4dd52fcc15ba2
Parents: bfddbb8
Author: Dan Haywood
Authored: Fri Jul 8 10:21:39 2016 +0100
Committer: Dan Haywood
Committed: Fri Jul 8 10:21:39 2016 +0100
--
.../main/java/domainapp/dom/simple/SimpleObject.java | 14 ++
1 file changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/bd0fef2b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
--
diff --git
a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
index 676b75c..ff0393a 100644
---
a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
+++
b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
@@ -133,6 +133,20 @@ public class SimpleObject implements
Comparable {
}
//endregion
+//region > delete (action)
+public static class DeleteDomainEvent extends
ActionDomainEvent {}
+@Action(
+domainEvent = DeleteDomainEvent.class,
+semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE
+)
+public void delete() {
+final String title = titleService.titleOf(this);
+messageService.informUser(String.format("'%s' deleted", title));
+repositoryService.remove(this);
+}
+
+//endregion
+
//region > toString, compareTo
@Override
public String toString() {
[11/11] isis git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a7e2e025 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a7e2e025 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a7e2e025 Branch: refs/heads/release-1.13.0-RC1 Commit: a7e2e025eedb4dca67d83e06d12b2517c98f4ba4 Parents: 15469e2 Author: Dan Haywood Authored: Fri Jul 8 10:44:01 2016 +0100 Committer: Dan Haywood Committed: Fri Jul 8 10:44:01 2016 +0100 -- example/archetype/simpleapp/pom.xml | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/a7e2e025/example/archetype/simpleapp/pom.xml -- diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index af76b76..d2f508a 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.apache.isis.archetype simpleapp-archetype -1.13.0 +1.14.0-SNAPSHOT maven-archetype simpleapp-archetype @@ -47,8 +47,4 @@ 1.13.0 ../../../core/pom.xml - - -simpleapp-archetype-1.13.0 -
[03/11] isis git commit: ISIS-1335: recreating simpleapp archetype
http://git-wip-us.apache.org/repos/asf/isis/blob/58eb2cd5/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
--
diff --git
a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
deleted file mode 100644
index 787629f..000
---
a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package domainapp.integtests.tests.modules.simple;
-
-import java.sql.SQLIntegrityConstraintViolationException;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import com.google.common.base.Throwables;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Test;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureScripts;
-
-import domainapp.dom.simple.SimpleObject;
-import domainapp.dom.simple.SimpleObjects;
-import domainapp.fixture.dom.simple.SimpleObjectsTearDown;
-import domainapp.fixture.scenarios.RecreateSimpleObjects;
-import domainapp.integtests.tests.DomainAppIntegTest;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class SimpleObjectsIntegTest extends DomainAppIntegTest {
-
-@Inject
-FixtureScripts fixtureScripts;
-@Inject
-SimpleObjects simpleObjects;
-
-public static class ListAll extends SimpleObjectsIntegTest {
-
-@Test
-public void happyCase() throws Exception {
-
-// given
-RecreateSimpleObjects fs = new RecreateSimpleObjects();
-fixtureScripts.runFixtureScript(fs, null);
-nextTransaction();
-
-// when
-final List all = wrap(simpleObjects).listAll();
-
-// then
-assertThat(all).hasSize(fs.getSimpleObjects().size());
-
-SimpleObject simpleObject = wrap(all.get(0));
-
assertThat(simpleObject.getName()).isEqualTo(fs.getSimpleObjects().get(0).getName());
-}
-
-@Test
-public void whenNone() throws Exception {
-
-// given
-FixtureScript fs = new SimpleObjectsTearDown();
-fixtureScripts.runFixtureScript(fs, null);
-nextTransaction();
-
-// when
-final List all = wrap(simpleObjects).listAll();
-
-// then
-assertThat(all).hasSize(0);
-}
-}
-
-public static class Create extends SimpleObjectsIntegTest {
-
-@Test
-public void happyCase() throws Exception {
-
-// given
-FixtureScript fs = new SimpleObjectsTearDown();
-fixtureScripts.runFixtureScript(fs, null);
-nextTransaction();
-
-// when
-wrap(simpleObjects).create("Faz");
-
-// then
-final List all = wrap(simpleObjects).listAll();
-assertThat(all).hasSize(1);
-}
-
-@Test
-public void whenAlreadyExists() throws Exception {
-
-// given
-FixtureScript fs = new SimpleObjectsTearDown();
-fixtureScripts.runFixtureScript(fs, null);
-nextTransaction();
-wrap(simpleObjects).create("Faz");
-nextTransaction();
-
-// then
-
expectedExceptions.expectCause(causalChainContains(SQLIntegrityConstraintViolationException.class));
-
-// when
-wrap(simpleObjects).create("Faz");
-nextTransaction();
-}
-
-private static Matcher causalChainContains(final
[09/11] isis git commit: ISIS-1335: recreating simpleapp archetype
ISIS-1335: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/81017f8a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/81017f8a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/81017f8a
Branch: refs/heads/release-1.13.0-RC1
Commit: 81017f8a4572c82e3e9603f4ca2c1897a73b15a2
Parents: bd0fef2
Author: Dan Haywood
Authored: Fri Jul 8 10:41:18 2016 +0100
Committer: Dan Haywood
Committed: Fri Jul 8 10:41:18 2016 +0100
--
.../main/java/domainapp/dom/simple/SimpleObject.java | 14 ++
.../resources/projects/basic/archetype.properties | 5 +
.../src/test/resources/projects/basic/goal.txt| 0
3 files changed, 19 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/81017f8a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
--
diff --git
a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
index 4d5658f..7e06e31 100644
---
a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
+++
b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
@@ -136,6 +136,20 @@ public class SimpleObject implements
Comparable {
}
//endregion
+//region > delete (action)
+public static class DeleteDomainEvent extends
ActionDomainEvent {}
+@Action(
+domainEvent = DeleteDomainEvent.class,
+semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE
+)
+public void delete() {
+final String title = titleService.titleOf(this);
+messageService.informUser(String.format("'%s' deleted", title));
+repositoryService.remove(this);
+}
+
+//endregion
+
//region > toString, compareTo
@Override
public String toString() {
http://git-wip-us.apache.org/repos/asf/isis/blob/81017f8a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
--
diff --git
a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
new file mode 100644
index 000..b0dfe87
--- /dev/null
+++
b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -0,0 +1,5 @@
+#Fri Jul 08 10:41:07 BST 2016
+package=it.pkg
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=basic
http://git-wip-us.apache.org/repos/asf/isis/blob/81017f8a/example/archetype/simpleapp/src/test/resources/projects/basic/goal.txt
--
diff --git
a/example/archetype/simpleapp/src/test/resources/projects/basic/goal.txt
b/example/archetype/simpleapp/src/test/resources/projects/basic/goal.txt
new file mode 100644
index 000..e69de29
