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 2017/02/16 00:26:28 UTC
[01/12] isis git commit: ISIS-1561: adds missing license headers
Repository: isis
Updated Branches:
refs/heads/release-1.14.0-RC1 [created] 4f2d3c537
ISIS-1561: adds 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/31a6812c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/31a6812c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/31a6812c
Branch: refs/heads/release-1.14.0-RC1
Commit: 31a6812cb2cbb86c5d5332e4f6a752c5956bd4b7
Parents: bf9a7a5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 15 17:14:10 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 15 17:14:10 2017 +0000
----------------------------------------------------------------------
...merForEnvironmentVariableISIS_OPTS_Test.java | 18 ++++++++++
...apterMementoProviderForReferenceChoices.java | 36 ++++++++++++++++++++
...oProviderForReferenceObjectAutoComplete.java | 36 ++++++++++++++++++++
...ForReferenceParamOrPropertyAutoComplete.java | 36 ++++++++++++++++++++
...ctAdapterMementoProviderForValueChoices.java | 36 ++++++++++++++++++++
5 files changed, 162 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/31a6812c/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
index ed6b8e9..20c412e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
@@ -1,3 +1,21 @@
+/*
+ * 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.core.commons.configbuilder;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/isis/blob/31a6812c/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
index de3f7f4..3459fdb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
@@ -1,3 +1,39 @@
+/*
+ * 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.
+ */
+/*
+ * 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.viewer.wicket.ui.components.widgets.select2.providers;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/isis/blob/31a6812c/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
index d55fd58..6d7d1bb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
@@ -1,3 +1,39 @@
+/*
+ * 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.
+ */
+/*
+ * 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.viewer.wicket.ui.components.widgets.select2.providers;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/isis/blob/31a6812c/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
index 6ce9783..e31b315 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
@@ -1,3 +1,39 @@
+/*
+ * 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.
+ */
+/*
+ * 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.viewer.wicket.ui.components.widgets.select2.providers;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/isis/blob/31a6812c/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
index cf52db6..8db09ea 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
@@ -1,3 +1,39 @@
+/*
+ * 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.
+ */
+/*
+ * 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.viewer.wicket.ui.components.widgets.select2.providers;
import java.util.Collection;
[12/12] isis git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[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/4f2d3c53
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4f2d3c53
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4f2d3c53
Branch: refs/heads/release-1.14.0-RC1
Commit: 4f2d3c5370761837d1c5f3959c6346108f6d647d
Parents: 5b30846
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 16 00:19:22 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 16 00:19:22 2017 +0000
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4f2d3c53/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 50ed8ed..0a486a4 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -45,7 +45,7 @@
<connection>scm:git:git@github.com:danhaywood/java-mavenmixin-standard.git</connection>
<developerConnection>scm:git:git@github.com:danhaywood/java-mavenmixin-standard.git</developerConnection>
<url>git@github.com:danhaywood/java-mavenmixin-standard.git</url>
- <tag>simpleapp-archetype-1.14.0</tag>
+ <tag>HEAD</tag>
</scm>
<parent>
<groupId>org.apache.isis.core</groupId>
[04/12] isis git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[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/5e6858c5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5e6858c5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5e6858c5
Branch: refs/heads/release-1.14.0-RC1
Commit: 5e6858c5ce3f75a9a0553b5a86fd92e4c9bfb6af
Parents: f517025
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 15 22:32:22 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 15 22:32:22 2017 +0000
----------------------------------------------------------------------
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/5e6858c5/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index cb3592b..24833ad 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 5bac6fe..35e8b52 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 58e0d72..ad285d4 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index de97af7..9dbb13a 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index e8aa6c7..1dce94f 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c162ab0..a1ed874 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -187,7 +187,7 @@
<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>isis-1.14.0</tag>
+ <tag>HEAD</tag>
</scm>
<url>http://isis.apache.org</url>
@@ -1083,13 +1083,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1098,14 +1098,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1114,14 +1114,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1130,7 +1130,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1139,14 +1139,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1155,40 +1155,40 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1196,36 +1196,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1234,12 +1234,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
@@ -1247,41 +1247,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-applib</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1291,7 +1291,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
<!-- JodaTime -->
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 0b53490..b0c23fe 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/schema/pom.xml
----------------------------------------------------------------------
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index e77d3a0..b4f9094 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-schema</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index f3d432e..4401c8d 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
<name>Apache Isis Security Shiro</name>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/security/pom.xml
----------------------------------------------------------------------
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 9e67b48..5bf1373 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index d121e29..700016f 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index f0b079b..c575376 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 73c38fb..ae150f4 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index e42366e..a1212b6 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index eb5bf3d..1119220 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 262ac4a..ef3c149 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/viewer-wicket-impl/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 1f14437..742969b 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<name>Apache Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index cb0ca31..bb0f0b8 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/viewer-wicket-ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index 26d2fdb..f169810 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 50467d7..fa85545 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/5e6858c5/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index da426a1..a8da251 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
[09/12] isis git commit: ISIS-1561: recreating simpleapp archetype
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
index 1393841..f8a13fc 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -19,19 +19,12 @@ ${symbol_pound} specific language governing permissions and limitations
${symbol_pound} under the License.
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-${symbol_pound}
-${symbol_pound} use GlobSpec to specify modules, system components and fixtures
-${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
${symbol_pound}
${symbol_pound} Specify the modules (= entities + services) and other components that make up
${symbol_pound} this application.
${symbol_pound}
-${symbol_pound} alternatively, can provide the AppManifest programmatically by overriding
-${symbol_pound} IsisWicketApplication${symbol_pound}newIsisWicketModule()
-${symbol_pound}
isis.appManifest=domainapp.application.manifest.DomainAppAppManifest
${symbol_pound}isis.appManifest=domainapp.application.manifest.DomainAppAppManifestBypassSecurity
@@ -39,261 +32,8 @@ ${symbol_pound}isis.appManifest=domainapp.application.manifest.DomainAppAppManif
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-${symbol_pound}
-${symbol_pound} MetaModel
-${symbol_pound}
-${symbol_pound} The metamodel typically does not require additional configuration, although
-${symbol_pound} the system components (defined above) may refine the metamodel for their needs.
-${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-
-
-${symbol_pound}
-${symbol_pound} Additional programming model facet factories, or remove standard facet factories.
-${symbol_pound} Comma separated list of fully qualified class names.
-${symbol_pound}
-${symbol_pound}isis.reflector.facets.include=
-${symbol_pound}isis.reflector.facets.exclude=
-
-
-${symbol_pound}
-${symbol_pound} Metamodel validation (in addition to that automatically performed by the programming model facet factories)
-${symbol_pound} Default implementation does nothing.
-${symbol_pound}
-${symbol_pound} Use a custom implementation to enforce additional constraints specific to your app/project/company.
-${symbol_pound}
-${symbol_pound}isis.reflector.validator=org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault
-
-
-
-${symbol_pound}
-${symbol_pound} Whether to allow deprecated annotations/method prefixes (otherwise raise metamodel validation errors).
-${symbol_pound} If not specified, default is to allow.
-${symbol_pound}
-isis.reflector.validator.allowDeprecated=false
-
-
-${symbol_pound}
-${symbol_pound} Whether to ignore or honour (at least some of the) deprecated annotations/method prefixes.
-${symbol_pound} If not specified, default is to honour
-${symbol_pound}
-${symbol_pound}isis.reflector.facets.ignoreDeprecated=false
-
-
-
-${symbol_pound}
-${symbol_pound} Implementation to use for reading dynamic layout.
-${symbol_pound} Default implementation reads Xxx.layout.json files from classpath.
-${symbol_pound}
-${symbol_pound}isis.reflector.layoutMetadataReaders=org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson
-
-
-${symbol_pound}
-${symbol_pound} patterns for applying CssClassFa facet (font-awesome icons), matching on action names
-${symbol_pound}
-isis.reflector.facet.cssClassFa.patterns=${symbol_escape}
- new.*:fa-plus,${symbol_escape}
- add.*:fa-plus-square,${symbol_escape}
- create.*:fa-plus,${symbol_escape}
- update.*:fa-edit,${symbol_escape}
- change.*:fa-edit,${symbol_escape}
- remove.*:fa-minus-square,${symbol_escape}
- move.*:fa-exchange,${symbol_escape}
- first.*:fa-star,${symbol_escape}
- find.*:fa-search,${symbol_escape}
- lookup.*:fa-search,${symbol_escape}
- clear.*:fa-remove,${symbol_escape}
- previous.*:fa-step-backward,${symbol_escape}
- next.*:fa-step-forward,${symbol_escape}
- list.*:fa-list, ${symbol_escape}
- all.*:fa-list, ${symbol_escape}
- download.*:fa-download, ${symbol_escape}
- upload.*:fa-upload, ${symbol_escape}
- execute.*:fa-bolt, ${symbol_escape}
- run.*:fa-bolt, ${symbol_escape}
- calculate.*:fa-calculator, ${symbol_escape}
- verify.*:fa-check-circle, ${symbol_escape}
- refresh.*:fa-refresh, ${symbol_escape}
- install.*:fa-wrench
-
-
-${symbol_pound}
-${symbol_pound} patterns for applying CssClass facet (CSS styles), matching on member names
-${symbol_pound}
-isis.reflector.facet.cssClass.patterns=${symbol_escape}
- delete.*:btn-danger
-
-
-${symbol_pound}
-${symbol_pound} whether to suppress posting of events if not specified (left as Xxx.Default); defaults to true
-${symbol_pound}
-
-${symbol_pound}isis.reflector.facet.actionAnnotation.domainEvent.postForDefault=false
-${symbol_pound}isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault=false
-${symbol_pound}isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault=false
-
-${symbol_pound}isis.reflector.facet.domainObjectLayoutAnnotation.cssClassUiEvent.postForDefault=false
-${symbol_pound}isis.reflector.facet.domainObjectLayoutAnnotation.iconUiEvent.postForDefault=false
-${symbol_pound}isis.reflector.facet.domainObjectLayoutAnnotation.titleUiEvent.postForDefault=false
-
-isis.reflector.facet.domainObjectAnnotation.createdLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.persistingLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.persistedLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.loadedLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.updatingLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.updatedLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.removingLifecycleEvent.postForDefault=false
-
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
${symbol_pound}
-${symbol_pound} Domain Service configuration
+${symbol_pound} Remaining properties are loaded programmatically by the AppManifest
+${symbol_pound} (they are unlikely to vary between dev/test/prod so can be "baked in")
${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-
-${symbol_pound}
-${symbol_pound} required by EmailServiceDefault
-${symbol_pound}
-${symbol_pound}isis.service.email.sender.address=some.valid@email.address
-${symbol_pound}isis.service.email.sender.password=the.password.for-isis.service.email.sender.address
-
-
-${symbol_pound}
-${symbol_pound} whether ExceptionRecognizers should also log any recognized exceptions
-${symbol_pound} (default false; enable for diagnostics/debugging)
-${symbol_pound}
-${symbol_pound}isis.services.exceprecog.logRecognizedExceptions=true
-
-
-${symbol_pound}
-${symbol_pound} disable to (automatically registered) ExceptionRecognizerCompositeForJdoObjectStore service
-${symbol_pound} almost all of this service should be registered. Since all exception recognizer implementations
-${symbol_pound} are consulted in the event of an exception, it's not sufficient to override the implementation
-${symbol_pound} (in isis.services); instead this configuration property disables this particular implementation.
-${symbol_pound}
-${symbol_pound}isis.services.ExceptionRecognizerCompositeForJdoObjectStore.disable=true
-
-
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-${symbol_pound}
-${symbol_pound} Auditing, Commands, Publishing
-${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-
-${symbol_pound}
-${symbol_pound} Whether changes to objects should be audited; if not set, defaults to "none"
-${symbol_pound} - if not set or set to "none", can explicitly enable using @DomainObject(auditing=Auditing.ENABLED)
-${symbol_pound} - if set to "all", can explicitly disable using @Object(auditing=Auditing.DISABLED)
-${symbol_pound}
-${symbol_pound}isis.services.audit.objects=all|none
-
-
-${symbol_pound}
-${symbol_pound} Whether changes to objects should be published; if not set, defaults to "none"
-${symbol_pound} - if not set or set to "none", can explicitly enable using @DomainObject(publishing=Publishing.ENABLED)
-${symbol_pound} - if set to "all", can explicitly disable using @Object(publishing=Publishing.DISABLED)
-${symbol_pound}
-${symbol_pound}isis.services.publish.objects=all|none
-
-
-${symbol_pound}
-${symbol_pound} Whether all (or all non-query only) actions should be reified as commands; if not set, defaults to "none"
-${symbol_pound} - if not set or set to "none", can explicitly enable using @Action(command=CommandReification.ENABLED)
-${symbol_pound} - if set to "all", can explicitly disable using @Action(command=CommandReification.DISABLED)
-${symbol_pound}
-${symbol_pound}isis.services.command.actions=all|none|ignoreSafe
-
-
-${symbol_pound}
-${symbol_pound} Whether all (or all non-query only) action invocations should be published; if not set, defaults to "none"
-${symbol_pound} - if not set or set to "none", can explicitly enable using @Action(publishing=Publishing.ENABLED)
-${symbol_pound} - if set to "all", can explicitly disable using @Action(publishing=Publishing.DISABLED)
-${symbol_pound}
-${symbol_pound}isis.services.publish.actions=all|none|ignoreSafe
-
-
-${symbol_pound}
-${symbol_pound} Whether all property edits sshould be published; if not set, defaults to "none"
-${symbol_pound} - if not set or set to "none", can explicitly enable using @Property(publishing=Publishing.ENABLED)
-${symbol_pound} - if set to "all", can explicitly disable using @Property(publishing=Publishing.DISABLED)
-${symbol_pound}
-${symbol_pound}isis.services.publish.properties=all|none
-
-
-
-${symbol_pound}
-${symbol_pound} Whether the ApplicationFeatureRepository should eagerly initialize itself (increasing start-up times)
-${symbol_pound} or initialize itself lazily. Default is lazy initialization.
-${symbol_pound}
-${symbol_pound}isis.services.applicationFeatures.init=lazy|eager
-
-
-${symbol_pound}
-${symbol_pound} Whether the framework supports inject...() and set...() styles of dependency injection. By default the former
-${symbol_pound} is disabled, the latter is enabled. Disabling these settings can reduce application start-up times.
-${symbol_pound}
-${symbol_pound}isis.services.injector.injectPrefix=false|true
-${symbol_pound}isis.services.injector.setPrefix=false|true
-isis.services.injector.setPrefix=false
-
-
-
-
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-${symbol_pound}
-${symbol_pound} Policies
-${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-
-${symbol_pound}
-${symbol_pound} Whether editing of object properties is allowed; if not set, defaults to "true"
-${symbol_pound} - if not set or set to "true", can explicitly disable using @DomainObject(editing=Editing.DISABLED)
-${symbol_pound} - if set to "false", can explicitly enable using @DomainObject(editing=Editing.ENABLED)
-${symbol_pound}
-${symbol_pound}isis.objects.editing=true|false
-
-
-
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-${symbol_pound}
-${symbol_pound} i18n
-${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-
-${symbol_pound}
-${symbol_pound} force read translations, even if running in prototype mode
-${symbol_pound}
-${symbol_pound}isis.services.translation.po.mode=read
-
-
-
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-${symbol_pound}
-${symbol_pound} Viewer defaults
-${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-
-${symbol_pound}
-${symbol_pound} Specify viewer defaults
-${symbol_pound}
-${symbol_pound}isis.viewers.paged.standalone=30
-${symbol_pound}isis.viewers.paged.parented=10
-
-
-${symbol_pound}isis.viewers.propertyLayout.labelPosition=LEFT
-${symbol_pound}isis.viewers.parameterLayout.labelPosition=LEFT
-
-
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-${symbol_pound}
-${symbol_pound} Value facet defaults
-${symbol_pound}
-${symbol_pound} (see also viewer-specific config files, eg viewer_wicket.properties)
-${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-
-${symbol_pound} as used by @Title of a date
-isis.value.format.date=dd-MM-yyyy
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
index ebbb701..0b3da2c 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
@@ -22,27 +22,12 @@ ${symbol_pound} under the License.
${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
${symbol_pound}
-${symbol_pound} Persistor
-${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-
-
-
-${symbol_pound} generally speaking this should not be enabled
-isis.persistor.disableConcurrencyChecking=false
-
-
-
-
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
-${symbol_pound}
${symbol_pound} JDBC configuration
${symbol_pound}
${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
${symbol_pound}
${symbol_pound} configuration file holding the JDO objectstore's JDBC configuration
-${symbol_pound} (this is a bit of a hack... just exploiting fact that Isis also loads this file)
${symbol_pound}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
deleted file mode 100644
index b8ee4c9..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-${symbol_pound}
-${symbol_pound} configuration file for the JDO/DataNucleus objectstore
-${symbol_pound}
-
-
-${symbol_pound}
-${symbol_pound} hook to perform additional initialization when JDO class metadata is loaded
-${symbol_pound} default implementation will attempt to run 'create schema' for the specified schema.
-${symbol_pound}
-${symbol_pound} this implementation is installed by default:
-${symbol_pound}isis.persistor.datanucleus.classMetadataLoadedListener=org.apache.isis.objectstore.jdo.datanucleus.CreateSchemaObjectFromClassMetadata
-
-
-${symbol_pound} whether to persist the event data as a "clob" or as a "zipped" byte[]
-${symbol_pound} default is "zipped"
-${symbol_pound}isis.persistor.datanucleus.PublishingService.serializedForm=zipped
-
-
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}
-${symbol_pound}
-${symbol_pound} DataNucleus' configuration
-${symbol_pound}
-${symbol_pound} The 'isis.persistor.datanucleus.impl' prefix is stripped off,
-${symbol_pound} remainder is passed through to DataNucleus
-${symbol_pound}
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}
-
-isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
-isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
-isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
-
-
-${symbol_pound}
-${symbol_pound} Require explicit persistence (since entities are Comparable and using ObjectContracts${symbol_pound}compareTo).
-${symbol_pound} see http://www.datanucleus.org/products/accessplatform_3_0/jdo/transaction_types.html
-${symbol_pound}
-isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
-
-
-${symbol_pound}
-${symbol_pound} How column names are identified
-${symbol_pound} (http://www.datanucleus.org/products/datanucleus/jdo/orm/datastore_identifiers.html)
-${symbol_pound}
-isis.persistor.datanucleus.impl.datanucleus.identifier.case=MixedCase
-
-${symbol_pound}
-${symbol_pound} L2 cache
-${symbol_pound} off except if explicitly marked as cacheable
-${symbol_pound} http://www.datanucleus.org/products/datanucleus/jdo/cache.html
-${symbol_pound}
-isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
-isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
-
-
-
-${symbol_pound}
-${symbol_pound} uncomment to use JNDI rather than direct JDBC
-${symbol_pound}
-${symbol_pound}isis.persistor.datanucleus.impl.datanucleus.ConnectionFactoryName=java:comp/env/jdbc/quickstart
-
-${symbol_pound}
-${symbol_pound} uncomment to use JTA resource
-${symbol_pound}
-${symbol_pound}isis.persistor.datanucleus.impl.datanucleus.ConnectionFactory2Name=java:comp/env/jdbc/quickstart-nontx
-${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.TransactionType=JTA
-
-
-
-${symbol_pound}
-${symbol_pound}
-${symbol_pound} JDBC connection details
-${symbol_pound} ... are in persistor.properties
-${symbol_pound}
-${symbol_pound}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/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
index 44d4718..b032a17 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Sat Dec 31 15:00:50 GMT 2016
+#Thu Feb 16 00:18:22 GMT 2017
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[02/12] isis git commit: ISIS-1561: fixes tagging for swagger menus
Posted by da...@apache.org.
ISIS-1561: fixes tagging for swagger menus
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/339d1b3c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/339d1b3c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/339d1b3c
Branch: refs/heads/release-1.14.0-RC1
Commit: 339d1b3c3e5b03404fdaf6360fb1132af9800eed
Parents: 31a6812
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 15 21:53:02 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 15 21:53:02 2017 +0000
----------------------------------------------------------------------
.../services/swagger/internal/Tagger.java | 18 +++++++++++++-----
.../services/user/UserServiceDefault.java | 2 ++
.../services/swagger/internal/TaggerTest.java | 16 ++++++++++++++--
.../modules/simple/dom/impl/SimpleObjectMenu.java | 3 +--
4 files changed, 30 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/339d1b3c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Tagger.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Tagger.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Tagger.java
index 19f71d9..adb9936 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Tagger.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Tagger.java
@@ -24,19 +24,24 @@ import java.util.regex.Pattern;
class Tagger {
static Pattern tagPatternIsisAddons = Pattern.compile("^org\\.isisaddons\\.module\\.([^\\.]+)\\.(.+)$");
+ static Pattern tagPatternIncodeCatalog = Pattern.compile("^org\\.incode\\.module\\.([^\\.]+)\\.(.+)$");
static Pattern tagPatternForFqcn = Pattern.compile("^.*\\.([^\\.]+)\\.([^\\.]+)$");
- static Pattern tagPatternForSchemaTable = Pattern.compile("^([^\\.]+)\\.([^\\.]+)$");
+ static Pattern tagPatternForTwoParts = Pattern.compile("^([^\\.]+)\\.([^\\.]+)$");
static Pattern tagPatternForJaxbDto = Pattern.compile("^.*\\.([^\\.]+)\\.(v[0-9][^\\.]*)\\.([^\\.]+)$");
String tagFor(final String str, final String fallback) {
- if (str.startsWith("org.apache.isis")) {
+ if (str.startsWith("org.apache.isis.")) {
return "> apache isis internals";
}
Matcher matcher;
matcher = tagPatternIsisAddons.matcher(str);
if (matcher.matches()) {
- return "isisaddons " + matcher.group(1);
+ return "isisaddons.org " + matcher.group(1);
+ }
+ matcher = tagPatternIncodeCatalog.matcher(str);
+ if (matcher.matches()) {
+ return "catalog.incode.org " + matcher.group(1);
}
matcher = tagPatternForJaxbDto.matcher(str);
if (matcher.matches()) {
@@ -46,9 +51,12 @@ class Tagger {
if (matcher.matches()) {
return matcher.group(1);
}
- matcher = tagPatternForSchemaTable.matcher(str);
+ matcher = tagPatternForTwoParts.matcher(str);
if (matcher.matches()) {
- // special cases for other Isis addons
+ if (str.startsWith("isisApplib")) {
+ return "> apache isis applib";
+ }
+ // special cases for other Isis addons, eg "isissecurity"
if (str.startsWith("isis")) {
return "isisaddons " + str.substring(4, str.indexOf("."));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/339d1b3c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
index 28827a8..bc4e822 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
@@ -81,6 +81,7 @@ public class UserServiceDefault implements UserService {
final String user;
final List<String> roles;
+
UserAndRoleOverrides(final String user) {
this(user, null);
}
@@ -119,6 +120,7 @@ public class UserServiceDefault implements UserService {
/**
* Not API; for use by the implementation of sudo/runAs (see {@link SudoService} etc.
*/
+ @Programmatic
public UserAndRoleOverrides currentOverridesIfAny() {
final Stack<UserAndRoleOverrides> userAndRoleOverrides = overrides.get();
return !userAndRoleOverrides.empty()
http://git-wip-us.apache.org/repos/asf/isis/blob/339d1b3c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/swagger/internal/TaggerTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/swagger/internal/TaggerTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/swagger/internal/TaggerTest.java
index 945d73e..48b0b4f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/swagger/internal/TaggerTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/swagger/internal/TaggerTest.java
@@ -55,15 +55,27 @@ public class TaggerTest {
@Test
public void isisAddons() throws Exception {
String tag = new Tagger().tagFor("org.isisaddons.module.security.app.feature.ApplicationClass", null);
- assertThat(tag, is(equalTo("isisaddons security")));
+ assertThat(tag, is(equalTo("isisaddons.org security")));
}
@Test
- public void applib() throws Exception {
+ public void incodeCatalog() throws Exception {
+ String tag = new Tagger().tagFor("org.incode.module.communications.foo.bar.FooBar", null);
+ assertThat(tag, is(equalTo("catalog.incode.org communications")));
+ }
+
+ @Test
+ public void internals() throws Exception {
String tag = new Tagger().tagFor("org.apache.isis.applib.fixturescripts.FixtureResult", null);
assertThat(tag, is(equalTo("> apache isis internals")));
}
+ @Test
+ public void applib() throws Exception {
+ String tag = new Tagger().tagFor("isisApplib.ConfigurationServiceMenu", null);
+ assertThat(tag, is(equalTo("> apache isis applib")));
+ }
+
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/339d1b3c/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
index 63a03a0..e0ac401 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
@@ -33,6 +33,7 @@ import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
@DomainService(
nature = NatureOfService.VIEW_MENU_ONLY,
+ objectType = "simple.SimpleObjectMenu",
repositoryFor = SimpleObject.class
)
@DomainServiceLayout(
@@ -41,8 +42,6 @@ import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
)
public class SimpleObjectMenu {
- public String getId() { return "simpleObjects"; }
-
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
@MemberOrder(sequence = "1")
[11/12] isis git commit: [maven-release-plugin] prepare release
simpleapp-archetype-1.14.0
Posted by da...@apache.org.
[maven-release-plugin] prepare release simpleapp-archetype-1.14.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5b30846e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5b30846e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5b30846e
Branch: refs/heads/release-1.14.0-RC1
Commit: 5b30846e310e08f4fbac04a6a4d49130fe4cf73e
Parents: 1a43d75
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 16 00:19:19 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 16 00:19:19 2017 +0000
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5b30846e/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index fa30929..50ed8ed 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.
-->
-<project xmlns="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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -45,7 +45,8 @@
<connection>scm:git:git@github.com:danhaywood/java-mavenmixin-standard.git</connection>
<developerConnection>scm:git:git@github.com:danhaywood/java-mavenmixin-standard.git</developerConnection>
<url>git@github.com:danhaywood/java-mavenmixin-standard.git</url>
- </scm>
+ <tag>simpleapp-archetype-1.14.0</tag>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
[07/12] isis git commit: ISIS-1561: further minor update to README
for use of docker
Posted by da...@apache.org.
ISIS-1561: further minor update to README for use of docker
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/033555b7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/033555b7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/033555b7
Branch: refs/heads/release-1.14.0-RC1
Commit: 033555b739de1814f2971b83e78d25877262cfc5
Parents: a78aafd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 16 00:08:22 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 16 00:09:51 2017 +0000
----------------------------------------------------------------------
example/application/simpleapp/README.adoc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/033555b7/example/application/simpleapp/README.adoc
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/README.adoc b/example/application/simpleapp/README.adoc
index 7e9aa92..5fb9fc0 100644
--- a/example/application/simpleapp/README.adoc
+++ b/example/application/simpleapp/README.adoc
@@ -226,9 +226,11 @@ The packaged image can be viewed using `docker images`.
+
[source,bash]
----
-docker run -d -p 8080:8080 mycompany/myapp
+docker container run -d -p 8080:8080 mycompany/myapp
----
+
+This can then be accessed at link:http://localhost:8080[localhost:8080].
++
See link:https://github.com/danhaywood/java-mavenmixin-docker#how-to-consume[mavenmixin-docker] for further details on how to run docker images.
* To upload the application as a docker image to link:https://hub.docker.com[docker hub] (or some other docker registry): +
[03/12] isis git commit: [maven-release-plugin] prepare release
isis-1.14.0
Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-1.14.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f5170251
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f5170251
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f5170251
Branch: refs/heads/release-1.14.0-RC1
Commit: f5170251066237879abcdbad5b4c5269b13abea9
Parents: 339d1b3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 15 22:32:18 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 15 22:32:18 2017 +0000
----------------------------------------------------------------------
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/f5170251/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 0679a79..cb3592b 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index a834871..5bac6fe 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 41fa92b..58e0d72 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 99ff1a2..de97af7 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 69be87e..e8aa6c7 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4e43f3d..c162ab0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<packaging>pom</packaging>
@@ -187,7 +187,7 @@
<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>
+ <tag>isis-1.14.0</tag>
</scm>
<url>http://isis.apache.org</url>
@@ -1083,13 +1083,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1098,14 +1098,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1114,14 +1114,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1130,7 +1130,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1139,14 +1139,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1155,40 +1155,40 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1196,36 +1196,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1234,12 +1234,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
@@ -1247,41 +1247,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1291,7 +1291,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
<!-- JodaTime -->
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index e70fb3b..0b53490 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/schema/pom.xml
----------------------------------------------------------------------
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 25e58a2..e77d3a0 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-schema</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 93d8e2a..f3d432e 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
<name>Apache Isis Security Shiro</name>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/security/pom.xml
----------------------------------------------------------------------
diff --git a/core/security/pom.xml b/core/security/pom.xml
index c89b85e..9e67b48 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 008ecd6..d121e29 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 23dd13e..f0b079b 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 53f7d79..73c38fb 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 3060db5..e42366e 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 3611539..eb5bf3d 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 704cf32..262ac4a 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/viewer-wicket-impl/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 56a1232..1f14437 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<name>Apache Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index 0aa91b0..cb0ca31 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/viewer-wicket-ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index c7ebe31..26d2fdb 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 9afc7f3..50467d7 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f5170251/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index c8223a5..da426a1 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.0</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
[08/12] isis git commit: ISIS-1561: adds missing property to
simpleapp parent pom.xml
Posted by da...@apache.org.
ISIS-1561: adds missing property to simpleapp parent pom.xml
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e3817a58
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e3817a58
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e3817a58
Branch: refs/heads/release-1.14.0-RC1
Commit: e3817a58572d62b83ad78f0fbd1a3d78667fdada
Parents: 033555b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 16 00:18:00 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 16 00:18:00 2017 +0000
----------------------------------------------------------------------
example/application/simpleapp/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e3817a58/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 568941a..f64283c 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -40,6 +40,7 @@
<assertj-core.version>3.6.1</assertj-core.version>
<mavenmixin-cucumberreporting.version>0.0.2</mavenmixin-cucumberreporting.version>
+ <maven-cucumber-reporting.version>3.2.0</maven-cucumber-reporting.version>
<maven-cucumber-reporting.dependency.log4j.version>2.7</maven-cucumber-reporting.dependency.log4j.version>
<mavenmixin-datanucleusenhance.version>0.0.4</mavenmixin-datanucleusenhance.version>
[10/12] isis git commit: ISIS-1561: recreating simpleapp archetype
Posted by da...@apache.org.
ISIS-1561: 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/1a43d75d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1a43d75d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1a43d75d
Branch: refs/heads/release-1.14.0-RC1
Commit: 1a43d75d992a5e4dca9647931060b2c753c11319
Parents: e3817a5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 16 00:18:33 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 16 00:18:33 2017 +0000
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 7 +-
.../META-INF/maven/archetype-metadata.xml | 6 +
.../resources/archetype-resources/README.adoc | 16 +-
...nAppFixtureScriptsSpecificationProvider.java | 4 +-
.../manifest/DomainAppAppManifest.java | 73 +++-
.../DomainAppAppManifestBypassSecurity.java | 10 +-
.../DomainAppAppManifestWithFixtures.java | 23 +-
...ppAppManifestWithFixturesBypassSecurity.java | 10 +-
.../services/dbmanager/HsqlDbManagerMenu.java | 3 +-
.../services/homepage/HomePageService.java | 3 +-
.../services/homepage/HomePageViewModel.java | 8 +-
.../application/manifest/isis.properties | 398 +++++++++++++++++++
.../modules/simple/dom/impl/SimpleObject.java | 9 +-
.../simple/dom/impl/SimpleObjectMenu.java | 2 +-
.../fixture/scenario/CreateSimpleObjects.java | 18 +-
.../fixture/scenario/SimpleObjectData.java | 52 +++
.../SimpleModuleIntegTestAbstract.java | 4 +-
.../tests/SimpleObject_IntegTest.java | 10 +-
.../main/resources/archetype-resources/pom.xml | 16 +-
.../archetype-resources/webapp/pom.xml | 7 +-
.../src/main/webapp/WEB-INF/isis.properties | 266 +------------
.../main/webapp/WEB-INF/persistor.properties | 15 -
.../WEB-INF/persistor_datanucleus.properties | 94 -----
.../projects/basic/archetype.properties | 2 +-
24 files changed, 599 insertions(+), 457 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index ba53779..fa30929 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
@@ -45,12 +45,11 @@
<connection>scm:git:git@github.com:danhaywood/java-mavenmixin-standard.git</connection>
<developerConnection>scm:git:git@github.com:danhaywood/java-mavenmixin-standard.git</developerConnection>
<url>git@github.com:danhaywood/java-mavenmixin-standard.git</url>
- <tag>HEAD</tag>
- </scm>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.2</version>
+ <version>1.14.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/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 60a0ce5..5d02ab8 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
@@ -118,6 +118,12 @@
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java</include>
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc b/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
index 0849274..5fb9fc0 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
@@ -177,7 +177,7 @@ mvn -DskipTests
+
[source,bash]
----
-mvn -Dskip.danhaywood-mavenmixin-isisvalidate
+mvn -Dskip.mavenmixin-isisvalidate
----
@@ -185,7 +185,7 @@ mvn -Dskip.danhaywood-mavenmixin-isisvalidate
+
[source,bash]
----
-mvn -Dskip.danhaywood-mavenmixin-cucumberreporting
+mvn -Dskip.mavenmixin-cucumberreporting
----
+
[TIP]
@@ -197,7 +197,7 @@ By default, cucumber reports are generated at `target/cucumber-html-reports/over
+
[source,bash]
----
-mvn -Dskip.danhaywood-mavenmixin-isisswagger
+mvn -Dskip.mavenmixin-isisswagger
----
+
[TIP]
@@ -209,7 +209,7 @@ By default, Swagger spec files are generated at `target/generated-resources/isis
+
[source,bash]
----
-mvn package -Dmavenmixin-docker
+mvn install -Dmavenmixin-docker
----
+
This assumes that the `${docker-plugin.imageName}` property has been defined in the `webapp` module.
@@ -217,7 +217,7 @@ Alternatively it can be specified on the command line using a system property, e
+
[source,bash]
----
-mvn package -Dmavenmixin-docker -Ddocker-plugin.imageName=mycompany/myapp
+mvn install -Dmavenmixin-docker -Ddocker-plugin.imageName=mycompany/myapp
----
+
The packaged image can be viewed using `docker images`.
@@ -226,16 +226,18 @@ The packaged image can be viewed using `docker images`.
+
[source,bash]
----
-docker run -d -p 8080:8080 mycompany/myapp
+docker container run -d -p 8080:8080 mycompany/myapp
----
+
+This can then be accessed at link:http://localhost:8080[localhost:8080].
++
See link:https://github.com/danhaywood/java-mavenmixin-docker#how-to-consume[mavenmixin-docker] for further details on how to run docker images.
* To upload the application as a docker image to link:https://hub.docker.com[docker hub] (or some other docker registry): +
+
[source,bash]
----
-mvn deploy -Dmavenmixin-docker
+mvn -pl webapp deploy -Dmavenmixin-docker
----
+
This assumes that the `${docker-plugin.imageName}` property has been defined, _and_ also that docker registry credentials have been specified in `~/.m2/settings.xml`.
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
index d257dbc..68db9e9 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
@@ -32,7 +32,9 @@ import domainapp.application.fixture.scenarios.DomainAppDemo;
/**
* Specifies where to find fixtures, and other settings.
*/
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN
+)
public class DomainAppFixtureScriptsSpecificationProvider implements FixtureScriptsSpecificationProvider {
@Override
public FixtureScriptsSpecification getSpecification() {
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
index c7dd2cc..6070f20 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
@@ -21,10 +21,16 @@
*/
package domainapp.application.manifest;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixturescripts.FixtureScript;
@@ -38,16 +44,44 @@ import domainapp.modules.simple.dom.SimpleModuleDomSubmodule;
*/
public class DomainAppAppManifest implements AppManifest {
+ private final List<Class<? extends FixtureScript>> fixtureScripts;
+ private final String authMechanism;
+ private final List<Class<?>> additionalModules;
+
+ public DomainAppAppManifest() {
+ this(
+ Collections.<Class<? extends FixtureScript>>emptyList(),
+ null,
+ Collections.<Class<?>>emptyList()
+ );
+ }
+
+ public DomainAppAppManifest(
+ final List<Class<? extends FixtureScript>> fixtureScripts,
+ final String authMechanism,
+ final List<Class<?>> additionalModules) {
+ this.fixtureScripts = elseEmptyIfNull(fixtureScripts);
+ this.authMechanism = authMechanism != null ? authMechanism : "shiro";
+ this.additionalModules = elseEmptyIfNull(additionalModules);
+ }
+
+ private static <T> List<T> elseEmptyIfNull(final List<T> list) {
+ return list == null ? Collections.<T>emptyList() : list;
+ }
+
/**
* Load all services and entities found in (the packages and subpackages within) these modules
*/
@Override
public List<Class<?>> getModules() {
- return Arrays.asList(
+ List<Class<?>> modules = Lists.newArrayList();
+ modules.addAll(Arrays.asList(
SimpleModuleDomSubmodule.class,
DomainAppApplicationModuleFixtureSubmodule.class,
DomainAppApplicationModuleServicesSubmodule.class
- );
+ ));
+ modules.addAll(additionalModules);
+ return modules;
}
/**
@@ -63,7 +97,7 @@ public class DomainAppAppManifest implements AppManifest {
*/
@Override
public String getAuthenticationMechanism() {
- return "shiro";
+ return authMechanism;
}
/**
@@ -71,7 +105,7 @@ public class DomainAppAppManifest implements AppManifest {
*/
@Override
public String getAuthorizationMechanism() {
- return "shiro";
+ return authMechanism;
}
/**
@@ -79,7 +113,7 @@ public class DomainAppAppManifest implements AppManifest {
*/
@Override
public List<Class<? extends FixtureScript>> getFixtures() {
- return Collections.emptyList();
+ return fixtureScripts;
}
/**
@@ -87,7 +121,34 @@ public class DomainAppAppManifest implements AppManifest {
*/
@Override
public Map<String, String> getConfigurationProperties() {
- return null;
+ final Map<String, String> props = Maps.newHashMap();
+
+ loadPropsInto(props, "isis.properties");
+
+ if(!fixtureScripts.isEmpty()) {
+ props.put("isis.persistor.datanucleus.install-fixtures", "true");
+ }
+
+ return props;
+ }
+
+ static void loadPropsInto(final Map<String, String> props, final String propertiesFile) {
+ final Properties properties = new Properties();
+ try {
+ try (final InputStream stream =
+ DomainAppAppManifest.class.getResourceAsStream(propertiesFile)) {
+ properties.load(stream);
+ for (Object key : properties.keySet()) {
+ final Object value = properties.get(key);
+ if(key instanceof String && value instanceof String) {
+ props.put((String)key, (String)value);
+ }
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(
+ String.format("Failed to load '%s' file ", propertiesFile), e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestBypassSecurity.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestBypassSecurity.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestBypassSecurity.java
index 15d5e7a..0c04b98 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestBypassSecurity.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestBypassSecurity.java
@@ -26,13 +26,7 @@ package domainapp.application.manifest;
*/
public class DomainAppAppManifestBypassSecurity extends DomainAppAppManifest {
- @Override
- public String getAuthenticationMechanism() {
- return "bypass";
- }
-
- @Override
- public String getAuthorizationMechanism() {
- return "bypass";
+ public DomainAppAppManifestBypassSecurity() {
+ super(null, "bypass", null);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java
index 0712ea6..4289d82 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java
@@ -21,14 +21,9 @@
*/
package domainapp.application.manifest;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
import domainapp.modules.simple.fixture.scenario.CreateSimpleObjects;
@@ -37,22 +32,12 @@ import domainapp.modules.simple.fixture.scenario.CreateSimpleObjects;
*/
public class DomainAppAppManifestWithFixtures extends DomainAppAppManifest {
- /**
- * Fixtures to be installed.
- */
- @Override
- public List<Class<? extends FixtureScript>> getFixtures() {
- return Lists.newArrayList(CreateSimpleObjects.class);
+ public DomainAppAppManifestWithFixtures() {
+ this(null);
}
- /**
- * Force fixtures to be loaded.
- */
- @Override
- public Map<String, String> getConfigurationProperties() {
- HashMap<String,String> props = Maps.newHashMap();
- props.put("isis.persistor.datanucleus.install-fixtures","true");
- return props;
+ public DomainAppAppManifestWithFixtures(final String authMechanism) {
+ super((List)Lists.newArrayList(CreateSimpleObjects.class), authMechanism, null);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixturesBypassSecurity.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixturesBypassSecurity.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixturesBypassSecurity.java
index c4a7c98..30805c4 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixturesBypassSecurity.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixturesBypassSecurity.java
@@ -26,13 +26,7 @@ package domainapp.application.manifest;
*/
public class DomainAppAppManifestWithFixturesBypassSecurity extends DomainAppAppManifestWithFixtures {
- @Override
- public String getAuthenticationMechanism() {
- return "bypass";
- }
-
- @Override
- public String getAuthorizationMechanism() {
- return "bypass";
+ public DomainAppAppManifestWithFixturesBypassSecurity() {
+ super("bypass");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/dbmanager/HsqlDbManagerMenu.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/dbmanager/HsqlDbManagerMenu.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/dbmanager/HsqlDbManagerMenu.java
index 87d6f5e..9187dd9 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/dbmanager/HsqlDbManagerMenu.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/dbmanager/HsqlDbManagerMenu.java
@@ -38,7 +38,8 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
@DomainService(
- nature = NatureOfService.VIEW_MENU_ONLY
+ nature = NatureOfService.VIEW_MENU_ONLY,
+ objectType = "prototyping.HsqlDbManagerMenu"
)
@DomainServiceLayout(
named = "Prototyping",
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageService.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageService.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageService.java
index 0ada068..07efddb 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageService.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageService.java
@@ -29,7 +29,8 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.factory.FactoryService;
@DomainService(
- nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY // trick to suppress the actions from the top-level menu
+ nature = NatureOfService.DOMAIN, // trick to suppress the actions from the top-level menu
+ objectType = "homepage.HomePageService"
)
public class HomePageService {
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
index eac86fe..b9d101a 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
@@ -23,13 +23,17 @@ package domainapp.application.services.homepage;
import java.util.List;
-import org.apache.isis.applib.annotation.ViewModel;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.i18n.TranslatableString;
import domainapp.modules.simple.dom.impl.SimpleObject;
import domainapp.modules.simple.dom.impl.SimpleObjectRepository;
-@ViewModel
+@DomainObject(
+ nature = Nature.VIEW_MODEL,
+ objectType = "homepage.HomePageViewModel"
+)
public class HomePageViewModel {
public TranslatableString title() {
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/resources/domainapp/application/manifest/isis.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/resources/domainapp/application/manifest/isis.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/resources/domainapp/application/manifest/isis.properties
new file mode 100644
index 0000000..5967b0d
--- /dev/null
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/resources/domainapp/application/manifest/isis.properties
@@ -0,0 +1,398 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
+${symbol_pound} or more contributor license agreements. See the NOTICE file
+${symbol_pound} distributed with this work for additional information
+${symbol_pound} regarding copyright ownership. The ASF licenses this file
+${symbol_pound} to you under the Apache License, Version 2.0 (the
+${symbol_pound} "License"); you may not use this file except in compliance
+${symbol_pound} with the License. You may obtain a copy of the License at
+${symbol_pound}
+${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
+${symbol_pound}
+${symbol_pound} Unless required by applicable law or agreed to in writing,
+${symbol_pound} software distributed under the License is distributed on an
+${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+${symbol_pound} KIND, either express or implied. See the License for the
+${symbol_pound} specific language governing permissions and limitations
+${symbol_pound} under the License.
+
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} MetaModel
+${symbol_pound}
+${symbol_pound} The metamodel typically does not require additional configuration, although
+${symbol_pound} the system components (defined above) may refine the metamodel for their needs.
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+
+${symbol_pound}
+${symbol_pound} Additional programming model facet factories, or remove standard facet factories.
+${symbol_pound} Comma separated list of fully qualified class names.
+${symbol_pound}
+${symbol_pound}isis.reflector.facets.include=
+${symbol_pound}isis.reflector.facets.exclude=
+
+
+${symbol_pound}
+${symbol_pound} Metamodel validation (in addition to that automatically performed by the programming model facet factories)
+${symbol_pound} Default implementation does nothing.
+${symbol_pound}
+${symbol_pound} Use a custom implementation to enforce additional constraints specific to your app/project/company.
+${symbol_pound}
+${symbol_pound}isis.reflector.validator=org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault
+
+
+
+${symbol_pound}
+${symbol_pound} Whether to allow deprecated annotations/method prefixes (otherwise raise metamodel validation errors).
+${symbol_pound} If not specified, default is to allow.
+${symbol_pound}
+isis.reflector.validator.allowDeprecated=false
+
+
+${symbol_pound}
+${symbol_pound} Whether to validate JDOQL clauses. If not specified, default is to validate.
+${symbol_pound}
+${symbol_pound}isis.reflector.validator.jdoqlFromClause=true
+${symbol_pound}isis.reflector.validator.jdoqlVariablesClause=true
+
+
+${symbol_pound}
+${symbol_pound} Whether to only allow hideXxx() and disableXxx() methods with no params.
+${symbol_pound} If not specified, defaults to false (ie will also search for methods with parameter types matching the action).
+${symbol_pound}
+isis.reflector.validator.noParamsOnly=true
+
+
+${symbol_pound}
+${symbol_pound} Whether to require the object type to be specified explicitly for entities.
+${symbol_pound} If not specified, defaults to false
+${symbol_pound}
+isis.reflector.validator.explicitObjectType=true
+
+
+${symbol_pound}
+${symbol_pound} Whether to ignore or honour (at least some of the) deprecated annotations/method prefixes.
+${symbol_pound} If not specified, default is to honour
+${symbol_pound}
+${symbol_pound}isis.reflector.facets.ignoreDeprecated=false
+
+
+${symbol_pound}
+${symbol_pound} Whether to enforce the rule that domain services can only declare actions, not properties and collections.
+${symbol_pound} If not specified, defaults to false
+${symbol_pound}
+isis.reflector.validator.serviceActionsOnly=true
+
+
+${symbol_pound}
+${symbol_pound} Whether to use only mixins, and no contributed services.
+${symbol_pound} If not specified, defaults to false
+${symbol_pound}
+isis.reflector.validator.mixinsOnly=true
+
+
+${symbol_pound}
+${symbol_pound} Implementation to use for reading dynamic layout.
+${symbol_pound} Default implementation reads Xxx.layout.json files from classpath.
+${symbol_pound}
+${symbol_pound}isis.reflector.layoutMetadataReaders=org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson
+
+
+${symbol_pound}
+${symbol_pound} patterns for applying CssClassFa facet (font-awesome icons), matching on action names
+${symbol_pound}
+isis.reflector.facet.cssClassFa.patterns=${symbol_escape}
+ new.*:fa-plus,${symbol_escape}
+ add.*:fa-plus-square,${symbol_escape}
+ create.*:fa-plus,${symbol_escape}
+ update.*:fa-edit,${symbol_escape}
+ change.*:fa-edit,${symbol_escape}
+ remove.*:fa-minus-square,${symbol_escape}
+ move.*:fa-exchange,${symbol_escape}
+ first.*:fa-star,${symbol_escape}
+ find.*:fa-search,${symbol_escape}
+ lookup.*:fa-search,${symbol_escape}
+ clear.*:fa-remove,${symbol_escape}
+ previous.*:fa-step-backward,${symbol_escape}
+ next.*:fa-step-forward,${symbol_escape}
+ list.*:fa-list, ${symbol_escape}
+ all.*:fa-list, ${symbol_escape}
+ download.*:fa-download, ${symbol_escape}
+ upload.*:fa-upload, ${symbol_escape}
+ execute.*:fa-bolt, ${symbol_escape}
+ run.*:fa-bolt, ${symbol_escape}
+ calculate.*:fa-calculator, ${symbol_escape}
+ verify.*:fa-check-circle, ${symbol_escape}
+ refresh.*:fa-refresh, ${symbol_escape}
+ install.*:fa-wrench
+
+
+${symbol_pound}
+${symbol_pound} patterns for applying CssClass facet (CSS styles), matching on member names
+${symbol_pound}
+isis.reflector.facet.cssClass.patterns=${symbol_escape}
+ delete.*:btn-danger
+
+
+${symbol_pound}
+${symbol_pound} whether to suppress posting of events if not specified (left as Xxx.Default); defaults to true
+${symbol_pound}
+
+${symbol_pound}isis.reflector.facet.actionAnnotation.domainEvent.postForDefault=false
+${symbol_pound}isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault=false
+${symbol_pound}isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault=false
+
+${symbol_pound}isis.reflector.facet.domainObjectLayoutAnnotation.cssClassUiEvent.postForDefault=false
+${symbol_pound}isis.reflector.facet.domainObjectLayoutAnnotation.iconUiEvent.postForDefault=false
+${symbol_pound}isis.reflector.facet.domainObjectLayoutAnnotation.titleUiEvent.postForDefault=false
+
+isis.reflector.facet.domainObjectAnnotation.createdLifecycleEvent.postForDefault=false
+isis.reflector.facet.domainObjectAnnotation.persistingLifecycleEvent.postForDefault=false
+isis.reflector.facet.domainObjectAnnotation.persistedLifecycleEvent.postForDefault=false
+isis.reflector.facet.domainObjectAnnotation.loadedLifecycleEvent.postForDefault=false
+isis.reflector.facet.domainObjectAnnotation.updatingLifecycleEvent.postForDefault=false
+isis.reflector.facet.domainObjectAnnotation.updatedLifecycleEvent.postForDefault=false
+isis.reflector.facet.domainObjectAnnotation.removingLifecycleEvent.postForDefault=false
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} Domain Service configuration
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+${symbol_pound}
+${symbol_pound} required by EmailServiceDefault
+${symbol_pound}
+${symbol_pound}isis.service.email.sender.address=some.valid@email.address
+${symbol_pound}isis.service.email.sender.password=the.password.for-isis.service.email.sender.address
+
+
+${symbol_pound}
+${symbol_pound} whether ExceptionRecognizers should also log any recognized exceptions
+${symbol_pound} (default false; enable for diagnostics/debugging)
+${symbol_pound}
+${symbol_pound}isis.services.exceprecog.logRecognizedExceptions=true
+
+
+${symbol_pound}
+${symbol_pound} disable to (automatically registered) ExceptionRecognizerCompositeForJdoObjectStore service
+${symbol_pound} almost all of this service should be registered. Since all exception recognizer implementations
+${symbol_pound} are consulted in the event of an exception, it's not sufficient to override the implementation
+${symbol_pound} (in isis.services); instead this configuration property disables this particular implementation.
+${symbol_pound}
+${symbol_pound}isis.services.ExceptionRecognizerCompositeForJdoObjectStore.disable=true
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} Auditing, Commands, Publishing
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+${symbol_pound}
+${symbol_pound} Whether changes to objects should be audited; if not set, defaults to "none"
+${symbol_pound} - if not set or set to "none", can explicitly enable using @DomainObject(auditing=Auditing.ENABLED)
+${symbol_pound} - if set to "all", can explicitly disable using @Object(auditing=Auditing.DISABLED)
+${symbol_pound}
+${symbol_pound}isis.services.audit.objects=all|none
+
+
+${symbol_pound}
+${symbol_pound} Whether changes to objects should be published; if not set, defaults to "none"
+${symbol_pound} - if not set or set to "none", can explicitly enable using @DomainObject(publishing=Publishing.ENABLED)
+${symbol_pound} - if set to "all", can explicitly disable using @Object(publishing=Publishing.DISABLED)
+${symbol_pound}
+${symbol_pound}isis.services.publish.objects=all|none
+
+
+${symbol_pound}
+${symbol_pound} Whether all (or all non-query only) actions should be reified as commands; if not set, defaults to "none"
+${symbol_pound} - if not set or set to "none", can explicitly enable using @Action(command=CommandReification.ENABLED)
+${symbol_pound} - if set to "all", can explicitly disable using @Action(command=CommandReification.DISABLED)
+${symbol_pound}
+${symbol_pound}isis.services.command.actions=all|none|ignoreSafe
+
+
+${symbol_pound}
+${symbol_pound} Whether all (or all non-query only) action invocations should be published; if not set, defaults to "none"
+${symbol_pound} - if not set or set to "none", can explicitly enable using @Action(publishing=Publishing.ENABLED)
+${symbol_pound} - if set to "all", can explicitly disable using @Action(publishing=Publishing.DISABLED)
+${symbol_pound}
+${symbol_pound}isis.services.publish.actions=all|none|ignoreSafe
+
+
+${symbol_pound}
+${symbol_pound} Whether all property edits sshould be published; if not set, defaults to "none"
+${symbol_pound} - if not set or set to "none", can explicitly enable using @Property(publishing=Publishing.ENABLED)
+${symbol_pound} - if set to "all", can explicitly disable using @Property(publishing=Publishing.DISABLED)
+${symbol_pound}
+${symbol_pound}isis.services.publish.properties=all|none
+
+
+
+${symbol_pound}
+${symbol_pound} Whether the ApplicationFeatureRepository should eagerly initialize itself (increasing start-up times)
+${symbol_pound} or initialize itself lazily. Default is lazy initialization.
+${symbol_pound}
+${symbol_pound}isis.services.applicationFeatures.init=lazy|eager
+
+
+${symbol_pound}
+${symbol_pound} Whether the framework supports inject...() and set...() styles of dependency injection. By default the former
+${symbol_pound} is disabled, the latter is enabled. Disabling these settings can reduce application start-up times.
+${symbol_pound}
+${symbol_pound}isis.services.injector.injectPrefix=false|true
+${symbol_pound}isis.services.injector.setPrefix=false|true
+isis.services.injector.setPrefix=false
+
+
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} Policies
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+${symbol_pound}
+${symbol_pound} Whether editing of object properties is allowed; if not set, defaults to "true"
+${symbol_pound} - if not set or set to "true", can explicitly disable using @DomainObject(editing=Editing.DISABLED)
+${symbol_pound} - if set to "false", can explicitly enable using @DomainObject(editing=Editing.ENABLED)
+${symbol_pound}
+isis.objects.editing=false
+
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} i18n
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+${symbol_pound}
+${symbol_pound} force read translations, even if running in prototype mode
+${symbol_pound}
+${symbol_pound}isis.services.translation.po.mode=read
+
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} Viewer defaults
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+${symbol_pound}
+${symbol_pound} Specify viewer defaults
+${symbol_pound}
+${symbol_pound}isis.viewers.paged.standalone=30
+${symbol_pound}isis.viewers.paged.parented=10
+
+
+${symbol_pound}isis.viewers.propertyLayout.labelPosition=LEFT
+${symbol_pound}isis.viewers.parameterLayout.labelPosition=LEFT
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} Value facet defaults
+${symbol_pound}
+${symbol_pound} (see also viewer-specific config files, eg viewer_wicket.properties)
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+${symbol_pound} as used by @Title of a date
+isis.value.format.date=dd-MM-yyyy
+
+
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} Persistor
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+
+
+${symbol_pound} generally speaking this should not be enabled
+isis.persistor.disableConcurrencyChecking=false
+
+
+${symbol_pound}
+${symbol_pound} hook to perform additional initialization when JDO class metadata is loaded
+${symbol_pound} default implementation will attempt to run 'create schema' for the specified schema.
+${symbol_pound}
+${symbol_pound} this implementation is installed by default:
+${symbol_pound}isis.persistor.datanucleus.classMetadataLoadedListener=org.apache.isis.objectstore.jdo.datanucleus.CreateSchemaObjectFromClassMetadata
+
+
+${symbol_pound} whether to persist the event data as a "clob" or as a "zipped" byte[]
+${symbol_pound} default is "zipped"
+${symbol_pound}isis.persistor.datanucleus.PublishingService.serializedForm=zipped
+
+
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} DataNucleus' configuration
+${symbol_pound}
+${symbol_pound} The 'isis.persistor.datanucleus.impl' prefix is stripped off,
+${symbol_pound} remainder is passed through to DataNucleus
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}
+
+isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
+isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
+isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
+
+
+${symbol_pound}
+${symbol_pound} Require explicit persistence (since entities are Comparable and using ObjectContracts${symbol_pound}compareTo).
+${symbol_pound} see http://www.datanucleus.org/products/accessplatform_3_0/jdo/transaction_types.html
+${symbol_pound}
+isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
+
+
+${symbol_pound}
+${symbol_pound} How column names are identified
+${symbol_pound} (http://www.datanucleus.org/products/datanucleus/jdo/orm/datastore_identifiers.html)
+${symbol_pound}
+isis.persistor.datanucleus.impl.datanucleus.identifier.case=MixedCase
+
+${symbol_pound}
+${symbol_pound} L2 cache
+${symbol_pound} off except if explicitly marked as cacheable
+${symbol_pound} http://www.datanucleus.org/products/datanucleus/jdo/cache.html
+${symbol_pound}
+isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
+isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
+
+
+
+${symbol_pound}
+${symbol_pound} uncomment to use JNDI rather than direct JDBC
+${symbol_pound}
+${symbol_pound}isis.persistor.datanucleus.impl.datanucleus.ConnectionFactoryName=java:comp/env/jdbc/quickstart
+
+${symbol_pound}
+${symbol_pound} uncomment to use JTA resource
+${symbol_pound}
+${symbol_pound}isis.persistor.datanucleus.impl.datanucleus.ConnectionFactory2Name=java:comp/env/jdbc/quickstart-nontx
+${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.TransactionType=JTA
+
+
+
+${symbol_pound}
+${symbol_pound}
+${symbol_pound} JDBC connection details
+${symbol_pound} ... are in persistor.properties
+${symbol_pound}
+${symbol_pound}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index 3344a4e..95da22a 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -43,8 +43,7 @@ import lombok.Setter;
@javax.jdo.annotations.PersistenceCapable(
identityType=IdentityType.DATASTORE,
- schema = "simple",
- table = "SimpleObject"
+ schema = "simple"
)
@javax.jdo.annotations.DatastoreIdentity(
strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY,
@@ -60,9 +59,7 @@ import lombok.Setter;
+ "WHERE name.indexOf(:name) >= 0 ")
})
@javax.jdo.annotations.Unique(name="SimpleObject_name_UNQ", members = {"name"})
-@DomainObject(
- objectType = "simple.SimpleObject"
-)
+@DomainObject() // objectType inferred from @PersistenceCapable${symbol_pound}schema
public class SimpleObject implements Comparable<SimpleObject> {
public SimpleObject(final String name) {
@@ -70,7 +67,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
}
@javax.jdo.annotations.Column(allowsNull = "false", length = 40)
- @Property(editing = Editing.DISABLED)
+ @Property() // editing disabled by default, see isis.properties
@Getter @Setter
@Title(prepend = "Object: ")
private String name;
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
index 07d9399..9114be5 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
@@ -36,6 +36,7 @@ import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
@DomainService(
nature = NatureOfService.VIEW_MENU_ONLY,
+ objectType = "simple.SimpleObjectMenu",
repositoryFor = SimpleObject.class
)
@DomainServiceLayout(
@@ -44,7 +45,6 @@ import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
)
public class SimpleObjectMenu {
-
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
@MemberOrder(sequence = "1")
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/CreateSimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/CreateSimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/CreateSimpleObjects.java
index 1211a6d..e6ce665 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/CreateSimpleObjects.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/CreateSimpleObjects.java
@@ -22,8 +22,6 @@
package domainapp.modules.simple.fixture.scenario;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import javax.annotation.Nullable;
@@ -41,9 +39,6 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
public class CreateSimpleObjects extends FixtureScript {
- public final List<String> NAMES = Collections.unmodifiableList(Arrays.asList(
- "Foo", "Bar", "Baz", "Frodo", "Froyo", "Fizz", "Bip", "Bop", "Bang", "Boo"));
-
/**
* The number of objects to create, up to 10; optional, defaults to 3.
*/
@@ -52,7 +47,7 @@ public class CreateSimpleObjects extends FixtureScript {
private Integer number;
/**
- * The simpleobjects created by this fixture (output).
+ * The objects created by this fixture (output).
*/
@Getter
private final List<SimpleObject> simpleObjects = Lists.newArrayList();
@@ -60,19 +55,20 @@ public class CreateSimpleObjects extends FixtureScript {
@Override
protected void execute(final ExecutionContext ec) {
+ int max = SimpleObjectData.values().length;
+
// defaults
final int number = defaultParam("number", ec, 3);
// validate
- if(number < 0 || number > NAMES.size()) {
- throw new IllegalArgumentException(String.format("number must be in range [0,%d)", NAMES.size()));
+ if(number < 0 || number > max) {
+ throw new IllegalArgumentException(String.format("number must be in range [0,%d)", max));
}
// execute
for (int i = 0; i < number; i++) {
- final String name = NAMES.get(i);
-
- final SimpleObject simpleObject = wrap(simpleObjectMenu).create(name);
+ final SimpleObjectData data = SimpleObjectData.values()[i];
+ final SimpleObject simpleObject = data.createWith(wrap(simpleObjectMenu));
ec.addResult(this, simpleObject);
simpleObjects.add(simpleObject);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/SimpleObjectData.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/SimpleObjectData.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/SimpleObjectData.java
new file mode 100644
index 0000000..9aa8017
--- /dev/null
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/SimpleObjectData.java
@@ -0,0 +1,52 @@
+#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.modules.simple.fixture.scenario;
+
+import domainapp.modules.simple.dom.impl.SimpleObject;
+import domainapp.modules.simple.dom.impl.SimpleObjectMenu;
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public enum SimpleObjectData {
+
+ FOO("Foo"),
+ BAR("Bar"),
+ BAZ("Baz"),
+ FRODO("Frodo"),
+ FROYO("Froyo"),
+ FIZZ("Fizz"),
+ BIP("Bip"),
+ BOP("Bop"),
+ BANG("Bang"),
+ BOO("Boo");
+
+ private final String name;
+
+ public SimpleObject createWith(final SimpleObjectMenu menu) {
+ return menu.create(name);
+ }
+
+ public SimpleObject findWith(final SimpleObjectMenu menu) {
+ return menu.findByName(name).get(0);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index df6dd09..97ba16e 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -56,11 +56,13 @@ public abstract class SimpleModuleIntegTestAbstract extends IntegrationTestAbstr
Util.withJavaxJdoRunInMemoryProperties(map);
Util.withDataNucleusProperties(map);
Util.withIsisIntegTestProperties(map);
+ // same as in isis.properties
+ map.put("isis.objects.editing","false");
return map;
}
@Override public List<Class<?>> getAdditionalServices() {
- return Lists.newArrayList(ModuleFixtureScriptsSpecificationProvider.class);
+ return (List)Lists.newArrayList(ModuleFixtureScriptsSpecificationProvider.class);
}
})
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index 57d4d99..887c5d1 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -37,7 +37,9 @@ import org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleu
import org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp;
import domainapp.modules.simple.dom.impl.SimpleObject;
+import domainapp.modules.simple.dom.impl.SimpleObjectMenu;
import domainapp.modules.simple.fixture.scenario.CreateSimpleObjects;
+import domainapp.modules.simple.fixture.scenario.SimpleObjectData;
import domainapp.modules.simple.fixture.teardown.SimpleModuleTearDown;
import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
import static org.assertj.core.api.Assertions.assertThat;
@@ -47,6 +49,8 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
@Inject
FixtureScripts fixtureScripts;
@Inject
+ SimpleObjectMenu simpleObjectMenu;
+ @Inject
TransactionService transactionService;
SimpleObject simpleObject;
@@ -59,7 +63,7 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
fixtureScripts.runFixtureScript(fs, null);
transactionService.nextTransaction();
- simpleObject = fs.getSimpleObjects().get(0);
+ simpleObject = SimpleObjectData.FOO.findWith(wrap(simpleObjectMenu));
assertThat(simpleObject).isNotNull();
}
@@ -136,7 +140,7 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
@Test
public void should_be_populated() throws Exception {
// when
- final Long id = mixin(Persistable_datanucleusIdLong.class, simpleObject).${symbol_dollar}${symbol_dollar}();
+ final Long id = mixin(Persistable_datanucleusIdLong.class, simpleObject).exec();
// then
assertThat(id).isGreaterThanOrEqualTo(0);
@@ -148,7 +152,7 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
@Test
public void should_be_populated() throws Exception {
// when
- final Timestamp timestamp = mixin(Persistable_datanucleusVersionTimestamp.class, simpleObject).${symbol_dollar}${symbol_dollar}();
+ final Timestamp timestamp = mixin(Persistable_datanucleusVersionTimestamp.class, simpleObject).exec();
// then
assertThat(timestamp).isNotNull();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index a0c4a22..7271b4b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -32,12 +32,13 @@
</prerequisites>
<properties>
- <isis.version>1.13.2</isis.version>
+ <isis.version>1.14.0</isis.version>
<lombok.version>1.16.10</lombok.version>
<assertj-core.version>3.6.1</assertj-core.version>
<mavenmixin-cucumberreporting.version>0.0.2</mavenmixin-cucumberreporting.version>
+ <maven-cucumber-reporting.version>3.2.0</maven-cucumber-reporting.version>
<maven-cucumber-reporting.dependency.log4j.version>2.7</maven-cucumber-reporting.dependency.log4j.version>
<mavenmixin-datanucleusenhance.version>0.0.4</mavenmixin-datanucleusenhance.version>
@@ -66,7 +67,7 @@
<maven-jxr-plugin.version>2.4</maven-jxr-plugin.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
- <mavenmixin-standard.version>0.0.2</mavenmixin-standard.version>
+ <mavenmixin-standard.version>0.0.3</mavenmixin-standard.version>
<maven-clean-plugin.version>2.5</maven-clean-plugin.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
@@ -87,14 +88,18 @@
<jdepend-maven-plugin.version>2.0-beta-2</jdepend-maven-plugin.version>
<findbugs-maven-plugin.version>2.5</findbugs-maven-plugin.version>
- <mavenmixin-docker.version>0.0.2</mavenmixin-docker.version>
+ <mavenmixin-docker.version>0.0.3</mavenmixin-docker.version>
<maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>
<docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
+ <gmavenplus-plugin.version>1.5</gmavenplus-plugin.version>
<mavendeps-isistesting.version>0.0.2</mavendeps-isistesting.version>
<mavendeps-isisintellij.version>0.0.1</mavendeps-isisintellij.version>
<mavendeps-isiswebapp.version>0.0.1</mavendeps-isiswebapp.version>
+ <compiler-plugin.source>1.7</compiler-plugin.source>
+ <compiler-plugin.target>1.7</compiler-plugin.target>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -242,6 +247,11 @@
<artifactId>docker-maven-plugin</artifactId>
<version>${docker-maven-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/1a43d75d/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
index dd9ddaa..db8b341 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
@@ -44,8 +44,11 @@
<docker-plugin.imageName>DOCKER_REGISTRY_ACCOUNT/${project.parent.artifactId}</docker-plugin.imageName>
<docker-plugin.resource.include>${maven-war-plugin.warName}.war</docker-plugin.resource.include>
- <docker-plugin.serverId>docker-hub</docker-plugin.serverId>
- <docker-plugin.registryUrl>https://index.docker.io/v1/</docker-plugin.registryUrl>
+
+ <docker-plugin.releaseServerId>docker-hub</docker-plugin.releaseServerId>
+ <docker-plugin.releaseRegistryUrl>https://index.docker.io/v1/</docker-plugin.releaseRegistryUrl>
+ <docker-plugin.snapshotServerId>docker-hub</docker-plugin.snapshotServerId>
+ <docker-plugin.snapshotRegistryUrl>https://index.docker.io/v1/</docker-plugin.snapshotRegistryUrl>
</properties>
[05/12] isis git commit: ISIS-1561: updates simpleapp pom.xml to ref
1.14.0
Posted by da...@apache.org.
ISIS-1561: updates simpleapp pom.xml to ref 1.14.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5dab2db2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5dab2db2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5dab2db2
Branch: refs/heads/release-1.14.0-RC1
Commit: 5dab2db273cbd89190db240db8127e434431f7d4
Parents: 5e6858c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 15 18:49:37 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 15 23:11:48 2017 +0000
----------------------------------------------------------------------
example/application/simpleapp/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5dab2db2/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 0da4e9e..568941a 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -34,7 +34,7 @@
</prerequisites>
<properties>
- <isis.version>1.14.0-SNAPSHOT</isis.version>
+ <isis.version>1.14.0</isis.version>
<lombok.version>1.16.10</lombok.version>
<assertj-core.version>3.6.1</assertj-core.version>
[06/12] isis git commit: ISIS-1561: minor fixes to README for
simpleapp
Posted by da...@apache.org.
ISIS-1561: minor fixes to README for simpleapp
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a78aafd2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a78aafd2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a78aafd2
Branch: refs/heads/release-1.14.0-RC1
Commit: a78aafd281519c9528ddd7e4a22819279d6403b9
Parents: 5dab2db
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 15 23:35:49 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 15 23:35:49 2017 +0000
----------------------------------------------------------------------
example/application/simpleapp/README.adoc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a78aafd2/example/application/simpleapp/README.adoc
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/README.adoc b/example/application/simpleapp/README.adoc
index 0849274..7e9aa92 100644
--- a/example/application/simpleapp/README.adoc
+++ b/example/application/simpleapp/README.adoc
@@ -177,7 +177,7 @@ mvn -DskipTests
+
[source,bash]
----
-mvn -Dskip.danhaywood-mavenmixin-isisvalidate
+mvn -Dskip.mavenmixin-isisvalidate
----
@@ -185,7 +185,7 @@ mvn -Dskip.danhaywood-mavenmixin-isisvalidate
+
[source,bash]
----
-mvn -Dskip.danhaywood-mavenmixin-cucumberreporting
+mvn -Dskip.mavenmixin-cucumberreporting
----
+
[TIP]
@@ -197,7 +197,7 @@ By default, cucumber reports are generated at `target/cucumber-html-reports/over
+
[source,bash]
----
-mvn -Dskip.danhaywood-mavenmixin-isisswagger
+mvn -Dskip.mavenmixin-isisswagger
----
+
[TIP]
@@ -209,7 +209,7 @@ By default, Swagger spec files are generated at `target/generated-resources/isis
+
[source,bash]
----
-mvn package -Dmavenmixin-docker
+mvn install -Dmavenmixin-docker
----
+
This assumes that the `${docker-plugin.imageName}` property has been defined in the `webapp` module.
@@ -217,7 +217,7 @@ Alternatively it can be specified on the command line using a system property, e
+
[source,bash]
----
-mvn package -Dmavenmixin-docker -Ddocker-plugin.imageName=mycompany/myapp
+mvn install -Dmavenmixin-docker -Ddocker-plugin.imageName=mycompany/myapp
----
+
The packaged image can be viewed using `docker images`.
@@ -235,7 +235,7 @@ See link:https://github.com/danhaywood/java-mavenmixin-docker#how-to-consume[mav
+
[source,bash]
----
-mvn deploy -Dmavenmixin-docker
+mvn -pl webapp deploy -Dmavenmixin-docker
----
+
This assumes that the `${docker-plugin.imageName}` property has been defined, _and_ also that docker registry credentials have been specified in `~/.m2/settings.xml`.