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/08/06 06:06:39 UTC
[1/3] isis git commit: ISIS-1685: reinstates the accidentally trashed
package-info for component.xsd
Repository: isis
Updated Branches:
refs/heads/master c07a848e2 -> 02489d011
ISIS-1685: reinstates the accidentally trashed package-info for component.xsd
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/630bb384
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/630bb384
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/630bb384
Branch: refs/heads/master
Commit: 630bb3849598650c40d6842486677dc820fd284f
Parents: c07a848
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Aug 6 07:02:26 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Aug 6 07:02:26 2017 +0100
----------------------------------------------------------------------
.../isis/applib/layout/component/package-info.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/630bb384/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
index e10905a..49bcff5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
@@ -18,6 +18,22 @@
*/
/**
+ * The classes in this package provide layout metadata for a domain object's properties, collections and actions - the
+ * "building blocks" which then must be arranged into some sort of layout.
+ *
+ * <p>
+ * The <code>bootstrap3</code> and <code>fixedcols</code> packages both provide different ways of doing the layout,
+ * and both reference the classes in this package.
+ * </p>
*
*/
+@javax.xml.bind.annotation.XmlSchema(
+ namespace = "http://isis.apache.org/applib/layout/component",
+ elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
+ xmlns = {
+ @javax.xml.bind.annotation.XmlNs(
+ namespaceURI = "http://isis.apache.org/applib/layout/component", prefix = "cpt")
+ } // specifying the location seems to cause JaxbService#toXsd() to not generate the schema; not sure why...
+ //, location = ..."http://isis.apache.org/schema/metamodel/layout/common/common.xsd"
+)
package org.apache.isis.applib.layout.component;
\ No newline at end of file
[2/3] isis git commit: ISIS-1686: adds isis.appManifest to
isis.properties for the two archetypes (this is always required)
Posted by da...@apache.org.
ISIS-1686: adds isis.appManifest to isis.properties for the two archetypes (this is always required)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4202aa06
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4202aa06
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4202aa06
Branch: refs/heads/master
Commit: 4202aa061e353e0e3ff26bb2e8f145f170def38a
Parents: 630bb38
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Aug 6 07:04:15 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Aug 6 07:04:15 2017 +0100
----------------------------------------------------------------------
.../src/main/resources/domainapp/application/isis.properties | 1 +
.../simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4202aa06/example/application/helloworld/src/main/resources/domainapp/application/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/helloworld/src/main/resources/domainapp/application/isis.properties b/example/application/helloworld/src/main/resources/domainapp/application/isis.properties
index 036d95d..cc7ef35 100644
--- a/example/application/helloworld/src/main/resources/domainapp/application/isis.properties
+++ b/example/application/helloworld/src/main/resources/domainapp/application/isis.properties
@@ -16,6 +16,7 @@
# under the License.
+isis.appManifest=domainapp.application.HelloWorldAppManifest
isis.reflector.validator.allowDeprecated=false
isis.reflector.validator.noParamsOnly=true
http://git-wip-us.apache.org/repos/asf/isis/blob/4202aa06/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
index e0185d1..961c086 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -16,6 +16,10 @@
# under the License.
+
+isis.appManifest=domainapp.application.manifest.DomainAppAppManifest
+
+
#
# All other properties are loaded programmatically by the AppManifest
# (they are unlikely to vary between dev/test/prod so can be "baked in")
[3/3] isis git commit: ISIS-1686: adds shiro as authMechanism for the
two archetypes
Posted by da...@apache.org.
ISIS-1686: adds shiro as authMechanism for the two archetypes
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/02489d01
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/02489d01
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/02489d01
Branch: refs/heads/master
Commit: 02489d011c460a5eb1943ebafbdf6b9df9dfa586
Parents: 4202aa0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Aug 6 07:06:24 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Aug 6 07:06:24 2017 +0100
----------------------------------------------------------------------
.../main/java/domainapp/application/HelloWorldAppManifest.java | 3 ++-
.../domainapp/application/manifest/DomainAppAppManifest.java | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/02489d01/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
----------------------------------------------------------------------
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
index e14a1b4..98d4f62 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
@@ -29,7 +29,8 @@ public class HelloWorldAppManifest extends AppManifestAbstract {
public static final Builder BUILDER = Builder
.forModules(HelloWorldModule.class)
- .withConfigurationPropertiesFile(HelloWorldAppManifest.class, "isis.properties");
+ .withConfigurationPropertiesFile(HelloWorldAppManifest.class, "isis.properties")
+ .withAuthMechanism("shiro");
public HelloWorldAppManifest() {
super(BUILDER);
http://git-wip-us.apache.org/repos/asf/isis/blob/02489d01/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
index f10dfdd..c52599a 100644
--- a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
+++ b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
@@ -38,8 +38,9 @@ public class DomainAppAppManifest extends AppManifestAbstract {
"isis.properties",
"authentication_shiro.properties",
"persistor_datanucleus.properties",
- "viewer_restfulobjects.properties", "viewer_wicket.properties"
- );
+ "viewer_restfulobjects.properties",
+ "viewer_wicket.properties"
+ ).withAuthMechanism("shiro");
public DomainAppAppManifest() {
super(BUILDER);