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 2012/12/04 23:30:56 UTC
[17/47] ISIS-188: normalizing file endings throughout
http://git-wip-us.apache.org/repos/asf/isis/blob/211aee9b/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml b/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
index 1692254..c453514 100644
--- a/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
+++ b/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
@@ -1,233 +1,233 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<web-app id="WebApp_ID" version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <display-name>Apache Isis Webapp</display-name>
-
-
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-
- <context-param>
- <param-name>deploymentType</param-name>
- <!--
- <param-value>SERVER</param-value>
- -->
- <param-value>SERVER_EXPLORATION</param-value>
- </context-param>
-
-
-
-
- <!--
- -
- -
- - config common to all viewer(s)
- -
- -
- -->
-
- <!-- bootstrap the Isis metamodel and runtime -->
- <listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
- </listener>
-
- <!-- which (optional) configuration file(s) to load -->
- <context-param>
- <param-name>isis.viewers</param-name>
- <param-value>html</param-value>
- </context-param>
-
-
- <!-- which configuration directory to read overloaded property files from -->
- <!--
- Normally configuration like this should be done from outside your web
- application. Especially if your configuration is not know in advance or
- if it can change depending on where the application gets deployed.
-
- For instance to configure this in Tomcat outside the application WAR add
- the following line to your application context ( For more detail see:
- http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Context_Parameters )
-
- <Parameter name="isis.config.dir" value="/usr/local/tomcat/conf/"
- override="true"/>
-
- If your configuration directory is fixed you can enable the following
- context parameter in here and forget about the outside part.
-
- <context-param>
- <param-name>isis.config.dir</param-name>
- <param-value>location of your config directory if fixed</param-value>
- </context-param>
- -->
-
- <!-- cache static resources for 1 day -->
- <filter>
- <filter-name>ResourceCachingFilter</filter-name>
- <filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
- <init-param>
- <param-name>CacheTime</param-name>
- <param-value>86400</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.js</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.css</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.png</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.jpg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.gif</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.html</url-pattern>
- </filter-mapping>
-
- <servlet>
- <servlet-name>Resource</servlet-name>
- <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.css</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.jpg</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.gif</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.js</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.html</url-pattern>
- </servlet-mapping>
-
-
-
-
-
- <!--
- -
- -
- - config specific to the html-viewer
- -
- -
- -->
- <!-- determine the format of the paths of the links etc that it generates -->
- <context-param>
- <param-name>viewer-html.suffix</param-name>
- <param-value>htmlviewer</param-value>
- </context-param>
-
- <!-- redirect requests to 'htmlviewer' to the HTML viewer's start page -->
- <filter>
- <filter-name>RedirectFilterForHtml</filter-name>
- <filter-class>org.apache.isis.core.webapp.routing.RedirectFilter</filter-class>
- <init-param>
- <param-name>redirectTo</param-name>
- <param-value>/start.htmlviewer</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>RedirectFilterForHtml</filter-name>
- <url-pattern>/htmlviewer</url-pattern>
- </filter-mapping>
-
- <!-- authenticate user, and set up an Isis Session -->
- <filter>
- <filter-name>IsisSessionFilterForHtml</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
- <init-param>
- <!-- lookup from cache, or if a logon filter was provided -->
- <param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
- </init-param>
- <init-param>
- <!-- what to do if no session was found; we indicate access only to a restricted list of paths -->
- <param-name>whenNoSession</param-name>
- <param-value>restricted</param-value>
- </init-param>
- <init-param>
- <!-- the list of paths that are accessible if no session was found -->
- <param-name>restricted</param-name>
- <param-value>/logon.htmlviewer,/register.htmlviewer</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>IsisSessionFilterForHtml</filter-name>
- <servlet-name>HtmlLogin</servlet-name>
- </filter-mapping>
- <filter-mapping>
- <filter-name>IsisSessionFilterForHtml</filter-name>
- <servlet-name>HtmlDispatcher</servlet-name>
- </filter-mapping>
-
- <servlet>
- <servlet-name>HtmlLogon</servlet-name>
- <servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
- <init-param>
- <param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
- </init-param>
- <init-param>
- <param-name>startPage</param-name>
- <param-value>start.htmlviewer</param-value>
- </init-param>
- </servlet>
- <servlet-mapping>
- <servlet-name>HtmlLogon</servlet-name>
- <url-pattern>/logon.htmlviewer</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>HtmlDispatcher</servlet-name>
- <servlet-class>org.apache.isis.viewer.html.servlet.ControllerServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>HtmlDispatcher</servlet-name>
- <url-pattern>*.htmlviewer</url-pattern>
- </servlet-mapping>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<web-app id="WebApp_ID" version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>Apache Isis Webapp</display-name>
+
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+ <context-param>
+ <param-name>deploymentType</param-name>
+ <!--
+ <param-value>SERVER</param-value>
+ -->
+ <param-value>SERVER_EXPLORATION</param-value>
+ </context-param>
+
+
+
+
+ <!--
+ -
+ -
+ - config common to all viewer(s)
+ -
+ -
+ -->
+
+ <!-- bootstrap the Isis metamodel and runtime -->
+ <listener>
+ <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ </listener>
+
+ <!-- which (optional) configuration file(s) to load -->
+ <context-param>
+ <param-name>isis.viewers</param-name>
+ <param-value>html</param-value>
+ </context-param>
+
+
+ <!-- which configuration directory to read overloaded property files from -->
+ <!--
+ Normally configuration like this should be done from outside your web
+ application. Especially if your configuration is not know in advance or
+ if it can change depending on where the application gets deployed.
+
+ For instance to configure this in Tomcat outside the application WAR add
+ the following line to your application context ( For more detail see:
+ http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Context_Parameters )
+
+ <Parameter name="isis.config.dir" value="/usr/local/tomcat/conf/"
+ override="true"/>
+
+ If your configuration directory is fixed you can enable the following
+ context parameter in here and forget about the outside part.
+
+ <context-param>
+ <param-name>isis.config.dir</param-name>
+ <param-value>location of your config directory if fixed</param-value>
+ </context-param>
+ -->
+
+ <!-- cache static resources for 1 day -->
+ <filter>
+ <filter-name>ResourceCachingFilter</filter-name>
+ <filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
+ <init-param>
+ <param-name>CacheTime</param-name>
+ <param-value>86400</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>ResourceCachingFilter</filter-name>
+ <url-pattern>*.js</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResourceCachingFilter</filter-name>
+ <url-pattern>*.css</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResourceCachingFilter</filter-name>
+ <url-pattern>*.png</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResourceCachingFilter</filter-name>
+ <url-pattern>*.jpg</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResourceCachingFilter</filter-name>
+ <url-pattern>*.gif</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResourceCachingFilter</filter-name>
+ <url-pattern>*.html</url-pattern>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>Resource</servlet-name>
+ <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
+ <url-pattern>*.css</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
+ <url-pattern>*.png</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
+ <url-pattern>*.jpg</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
+ <url-pattern>*.gif</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
+ <url-pattern>*.js</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
+ <url-pattern>*.html</url-pattern>
+ </servlet-mapping>
+
+
+
+
+
+ <!--
+ -
+ -
+ - config specific to the html-viewer
+ -
+ -
+ -->
+ <!-- determine the format of the paths of the links etc that it generates -->
+ <context-param>
+ <param-name>viewer-html.suffix</param-name>
+ <param-value>htmlviewer</param-value>
+ </context-param>
+
+ <!-- redirect requests to 'htmlviewer' to the HTML viewer's start page -->
+ <filter>
+ <filter-name>RedirectFilterForHtml</filter-name>
+ <filter-class>org.apache.isis.core.webapp.routing.RedirectFilter</filter-class>
+ <init-param>
+ <param-name>redirectTo</param-name>
+ <param-value>/start.htmlviewer</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>RedirectFilterForHtml</filter-name>
+ <url-pattern>/htmlviewer</url-pattern>
+ </filter-mapping>
+
+ <!-- authenticate user, and set up an Isis Session -->
+ <filter>
+ <filter-name>IsisSessionFilterForHtml</filter-name>
+ <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <init-param>
+ <!-- lookup from cache, or if a logon filter was provided -->
+ <param-name>authenticationSessionStrategy</param-name>
+ <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
+ </init-param>
+ <init-param>
+ <!-- what to do if no session was found; we indicate access only to a restricted list of paths -->
+ <param-name>whenNoSession</param-name>
+ <param-value>restricted</param-value>
+ </init-param>
+ <init-param>
+ <!-- the list of paths that are accessible if no session was found -->
+ <param-name>restricted</param-name>
+ <param-value>/logon.htmlviewer,/register.htmlviewer</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>IsisSessionFilterForHtml</filter-name>
+ <servlet-name>HtmlLogin</servlet-name>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>IsisSessionFilterForHtml</filter-name>
+ <servlet-name>HtmlDispatcher</servlet-name>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>HtmlLogon</servlet-name>
+ <servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
+ <init-param>
+ <param-name>authenticationSessionStrategy</param-name>
+ <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
+ </init-param>
+ <init-param>
+ <param-name>startPage</param-name>
+ <param-value>start.htmlviewer</param-value>
+ </init-param>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>HtmlLogon</servlet-name>
+ <url-pattern>/logon.htmlviewer</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>HtmlDispatcher</servlet-name>
+ <servlet-class>org.apache.isis.viewer.html.servlet.ControllerServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>HtmlDispatcher</servlet-name>
+ <url-pattern>*.htmlviewer</url-pattern>
+ </servlet-mapping>
+
+</web-app>
http://git-wip-us.apache.org/repos/asf/isis/blob/211aee9b/framework/STATUS
----------------------------------------------------------------------
diff --git a/framework/STATUS b/framework/STATUS
index 7c93bb2..771be7e 100644
--- a/framework/STATUS
+++ b/framework/STATUS
@@ -1,60 +1,60 @@
-Web site: http://incubator.apache.org/isis/
-
-Project Status
-
- Description
-
- Isis is an ASL 2.0 licensed implementation of the Naked Objects pattern and
- also an implementation of the Restful Objects specification. It is based on
- contributions of the original Naked Objects Framework along with a number
- of sister projects that were developed for the book "Domain Driven Design
- using Naked Objects " (pragprog 2009).
-
- Isis was accepted into the Incubator in 2010, September 7th.
-
- To participate in Isis, please join the mailing lists. Send an empty
- message to isis-users-subscribe@incubator.apache.org (for users)
- or to isis-dev-subscribe@incubator.apache.org (for contributors).
-
-Project info
-
- As a subproject of the Apache Incubator project, Isis follows the direction
- of the Apache Incubator PMC. Significant contributions over a sustained
- period of time can earn a contributor commit access to the codebase.
-
-Official releases:
- * 0.1.2-incubating : Release July 2011
- * 0.2.0-incubating : Release January 2012
-
-Other releases:
- * snapshot releases to repository.apache.org (snapshots repo)
-
-Resources:
-
- item type URL
- ------------- ----- -----------------------------------------------------
- Source code SVN http://svn.apache.org/repos/asf/incubator/isis/trunk/framework
- Status file www http://svn.apache.org/repos/asf/incubator/isis/trunk/framework/STATUS
- Website www http://incubator.apache.org/isis/
- Mailing list dev isis-dev@incubator.apache.org
- Mailing list users isis-users@incubator.apache.org
- JIRA www http://issues.apache.org/jira/browse/ISIS
- Wiki www http://cwiki.apache.org/confluence/display/ISIS/Index
- CI www http://builds.apache.org/hudson/job/isis-trunk-windows
- Fisheye www https://fisheye6.atlassian.com/graph/isis
-
-
-Team:
-
- role(s) user id name
- ----------------- ----- -------------------------------------
- Mentor, Committer struberg Mark Struberg
- Mentor, Committer bimargulies Benson Margulies
- Mentor, Committer mnour Mohammad Nour El-Din (CLA on file)
- Mentor, Committer sgoeschl Siegfried Goeschl
- Committer danhaywood Daniel Keir Haywood (CLA on file)
- Committer rmatthews Robert Charles Matthews (CLA on file)
- Committer kevin Kevin Meyer (CLA on file)
- Committer themalkolm Alexander Krasnukhin (CLA on file)
- Committer dslaughter David Slaughter (CLA on file)
- Committer uli Ulrich St�rk (CLA on file)
+Web site: http://incubator.apache.org/isis/
+
+Project Status
+
+ Description
+
+ Isis is an ASL 2.0 licensed implementation of the Naked Objects pattern and
+ also an implementation of the Restful Objects specification. It is based on
+ contributions of the original Naked Objects Framework along with a number
+ of sister projects that were developed for the book "Domain Driven Design
+ using Naked Objects " (pragprog 2009).
+
+ Isis was accepted into the Incubator in 2010, September 7th.
+
+ To participate in Isis, please join the mailing lists. Send an empty
+ message to isis-users-subscribe@incubator.apache.org (for users)
+ or to isis-dev-subscribe@incubator.apache.org (for contributors).
+
+Project info
+
+ As a subproject of the Apache Incubator project, Isis follows the direction
+ of the Apache Incubator PMC. Significant contributions over a sustained
+ period of time can earn a contributor commit access to the codebase.
+
+Official releases:
+ * 0.1.2-incubating : Release July 2011
+ * 0.2.0-incubating : Release January 2012
+
+Other releases:
+ * snapshot releases to repository.apache.org (snapshots repo)
+
+Resources:
+
+ item type URL
+ ------------- ----- -----------------------------------------------------
+ Source code SVN http://svn.apache.org/repos/asf/incubator/isis/trunk/framework
+ Status file www http://svn.apache.org/repos/asf/incubator/isis/trunk/framework/STATUS
+ Website www http://incubator.apache.org/isis/
+ Mailing list dev isis-dev@incubator.apache.org
+ Mailing list users isis-users@incubator.apache.org
+ JIRA www http://issues.apache.org/jira/browse/ISIS
+ Wiki www http://cwiki.apache.org/confluence/display/ISIS/Index
+ CI www http://builds.apache.org/hudson/job/isis-trunk-windows
+ Fisheye www https://fisheye6.atlassian.com/graph/isis
+
+
+Team:
+
+ role(s) user id name
+ ----------------- ----- -------------------------------------
+ Mentor, Committer struberg Mark Struberg
+ Mentor, Committer bimargulies Benson Margulies
+ Mentor, Committer mnour Mohammad Nour El-Din (CLA on file)
+ Mentor, Committer sgoeschl Siegfried Goeschl
+ Committer danhaywood Daniel Keir Haywood (CLA on file)
+ Committer rmatthews Robert Charles Matthews (CLA on file)
+ Committer kevin Kevin Meyer (CLA on file)
+ Committer themalkolm Alexander Krasnukhin (CLA on file)
+ Committer dslaughter David Slaughter (CLA on file)
+ Committer uli Ulrich St�rk (CLA on file)
http://git-wip-us.apache.org/repos/asf/isis/blob/211aee9b/framework/applib/src/main/java/org/apache/isis/applib/annotation/Paged.java
----------------------------------------------------------------------
diff --git a/framework/applib/src/main/java/org/apache/isis/applib/annotation/Paged.java b/framework/applib/src/main/java/org/apache/isis/applib/annotation/Paged.java
index d661243..3e3542b 100644
--- a/framework/applib/src/main/java/org/apache/isis/applib/annotation/Paged.java
+++ b/framework/applib/src/main/java/org/apache/isis/applib/annotation/Paged.java
@@ -1,44 +1,44 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The page size for instances of this class when rendered within
- * a table.
- *
- * <p>
- * If annotated on a collection, then the page size refers to
- * parented collections (eg <tt>Order#lineItems</tt>).
- *
- * <p>
- * If annotated on a type, then the page size refers to standalone
- * collections (eg as returned from a repository query).
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD})
-public @interface Paged {
-
- int value();
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.applib.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The page size for instances of this class when rendered within
+ * a table.
+ *
+ * <p>
+ * If annotated on a collection, then the page size refers to
+ * parented collections (eg <tt>Order#lineItems</tt>).
+ *
+ * <p>
+ * If annotated on a type, then the page size refers to standalone
+ * collections (eg as returned from a repository query).
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+public @interface Paged {
+
+ int value();
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/211aee9b/framework/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
----------------------------------------------------------------------
diff --git a/framework/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java b/framework/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
index 7a0ab3f..d612191 100644
--- a/framework/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
+++ b/framework/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
@@ -1,70 +1,70 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the resolving (loading from the datastore) of
- * a property or collection should be performed lazily or eagerly.
- *
- * <p>
- * By default, collections and reference properties are resolved
- * lazily, while value properties are resolved eagerly.
- *
- * <p>
- * Using this annotation, an <tt>Order#lineItems</tt> collection might be
- * resolved eagerly. A viewer might use this hint to "open"
- * the collection automatically so that the user could see a list of
- * line items immediately when the order is rendered.
- *
- * <p>
- * Or, a reference property containing an <tt>Address</tt> might be shown
- * address as an embedded property.
- *
- * <p>
- * Or, a value property might be annotated to resolve lazily; this would be
- * suitable for handling of BLOBs and CLOBs.
- *
- * <p>
- * For properties and collections there is some similarity between this concept
- * and that of eager-loading as supported by some object stores. Indeed, some
- * object stores may choose use their own specific annotations (eg a JDO default
- * fetch group) in order to infer this semantic.
- */
-@Inherited
-@Target( ElementType.METHOD )
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Resolve {
-
- public enum Type {
- EAGERLY,
- LAZILY
- }
-
- /**
- * How to resolve; by default {@value Type#EAGERLY}.
- */
- Type value() default Type.EAGERLY;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.applib.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the resolving (loading from the datastore) of
+ * a property or collection should be performed lazily or eagerly.
+ *
+ * <p>
+ * By default, collections and reference properties are resolved
+ * lazily, while value properties are resolved eagerly.
+ *
+ * <p>
+ * Using this annotation, an <tt>Order#lineItems</tt> collection might be
+ * resolved eagerly. A viewer might use this hint to "open"
+ * the collection automatically so that the user could see a list of
+ * line items immediately when the order is rendered.
+ *
+ * <p>
+ * Or, a reference property containing an <tt>Address</tt> might be shown
+ * address as an embedded property.
+ *
+ * <p>
+ * Or, a value property might be annotated to resolve lazily; this would be
+ * suitable for handling of BLOBs and CLOBs.
+ *
+ * <p>
+ * For properties and collections there is some similarity between this concept
+ * and that of eager-loading as supported by some object stores. Indeed, some
+ * object stores may choose use their own specific annotations (eg a JDO default
+ * fetch group) in order to infer this semantic.
+ */
+@Inherited
+@Target( ElementType.METHOD )
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Resolve {
+
+ public enum Type {
+ EAGERLY,
+ LAZILY
+ }
+
+ /**
+ * How to resolve; by default {@value Type#EAGERLY}.
+ */
+ Type value() default Type.EAGERLY;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/211aee9b/framework/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
----------------------------------------------------------------------
diff --git a/framework/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java b/framework/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
index cf9ff6f..c804f52 100644
--- a/framework/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
+++ b/framework/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
@@ -1,65 +1,65 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.applib.fixtures;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.isis.applib.fixtures.switchuser.SwitchUserService;
-import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
-
-/**
- * Convenience class for creating fixtures, with support to allow
- * users to be switching using the {@link SwitchUserService}.
- *
- * <p>
- * Note that unlike {@link AbstractFixture}, fixtures inheriting from
- * this class <i>cannot</i> be used as domain objects (the {@link SwitchUserService} does
- * not conform to the domain object programming conventions).
- */
-public abstract class AbstractFixtureSusa extends AbstractFixture implements SwitchUserServiceAware {
-
- public AbstractFixtureSusa() {
- super();
- }
-
- public AbstractFixtureSusa(final FixtureType fixtureType) {
- super(fixtureType);
- }
-
-
- // {{ User
- protected void switchUser(final String username, final String... roles) {
- switchUserService.switchUser(username, roles);
- }
-
- // }}
-
- // {{ Injected: SwitchUserService
- private SwitchUserService switchUserService;
-
- @Override
- public void setService(final SwitchUserService fixtureService) {
- this.switchUserService = fixtureService;
- }
- // }}
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.applib.fixtures;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.isis.applib.fixtures.switchuser.SwitchUserService;
+import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
+
+/**
+ * Convenience class for creating fixtures, with support to allow
+ * users to be switching using the {@link SwitchUserService}.
+ *
+ * <p>
+ * Note that unlike {@link AbstractFixture}, fixtures inheriting from
+ * this class <i>cannot</i> be used as domain objects (the {@link SwitchUserService} does
+ * not conform to the domain object programming conventions).
+ */
+public abstract class AbstractFixtureSusa extends AbstractFixture implements SwitchUserServiceAware {
+
+ public AbstractFixtureSusa() {
+ super();
+ }
+
+ public AbstractFixtureSusa(final FixtureType fixtureType) {
+ super(fixtureType);
+ }
+
+
+ // {{ User
+ protected void switchUser(final String username, final String... roles) {
+ switchUserService.switchUser(username, roles);
+ }
+
+ // }}
+
+ // {{ Injected: SwitchUserService
+ private SwitchUserService switchUserService;
+
+ @Override
+ public void setService(final SwitchUserService fixtureService) {
+ this.switchUserService = fixtureService;
+ }
+ // }}
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/211aee9b/framework/applib/src/main/resources/org/apache/isis/applib/AbstractContainedObject-hierarchy.ucd
----------------------------------------------------------------------
diff --git a/framework/applib/src/main/resources/org/apache/isis/applib/AbstractContainedObject-hierarchy.ucd b/framework/applib/src/main/resources/org/apache/isis/applib/AbstractContainedObject-hierarchy.ucd
index 98402a8..313ebd7 100644
--- a/framework/applib/src/main/resources/org/apache/isis/applib/AbstractContainedObject-hierarchy.ucd
+++ b/framework/applib/src/main/resources/org/apache/isis/applib/AbstractContainedObject-hierarchy.ucd
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<editmodel:ClassDiagramEditModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editmodel="editmodel.xmi" xmlns:options="options.xmi" name="AbstractContainedObject-hierarchy" size="843,745" id="org.apache.isis.applib" metadata="uml2-1.0" initialized="true" tag="1000" key="32303037303533312D31303030206170706C69622F64616E">
- <children xsi:type="editmodel:InterfaceEditModel" targetConnections="//@children.5/@sourceConnections.0" name="DomainObjectContainer" location="555,43" size="194,43" id="org.apache.isis.applib/DomainObjectContainer" runTimeClassModel="commit(),firstMatch(Lorg.apache.isis.applib.query.Query;),warnUser(Ljava.lang.String;),isPersistent(Ljava.lang.Object;),newInstance(Ljava.lang.Class;Ljava.lang.Object;),removeIfNotAlready(Ljava.lang.Object;),raiseError(Ljava.lang.String;),uniqueMatch(Ljava.lang.Class;Lorg.apache.isis.applib.Filter;),isValid(Ljava.lang.Object;),allMatches(Ljava.lang.Class;Ljava.lang.String;),allInstances(Ljava.lang.Class;),informUser(Ljava.lang.String;),objectChanged(Ljava.lang.Object;),persistIfNotAlready(Ljava.lang.Object;),uniqueMatch(Ljava.lang.Class;Ljava.lang.String;),remove(Ljava.lang.Object;),resolve(Ljava.lang.Object;),allMatches(Lorg.apache.isis.applib.query.Query;),validate(Ljava.lang.Object;),firstMatch(Ljava.lang.Class;Lorg.apache.isis.applib.Filter;),fir
stMatch(Ljava.lang.Class;LT;),uniqueMatch(Ljava.lang.Class;LT;),newTransientInstance(Ljava.lang.Class;),resolve(Ljava.lang.Object;Ljava.lang.Object;),flush(),allMatches(Ljava.lang.Class;LT;),getPropertyNames(),allMatches(Ljava.lang.Class;Lorg.apache.isis.applib.Filter;),getProperty(Ljava.lang.String;Ljava.lang.String;),persist(Ljava.lang.Object;),firstMatch(Ljava.lang.Class;Ljava.lang.String;),getProperty(Ljava.lang.String;),newPersistentInstance(Ljava.lang.Class;),uniqueMatch(Lorg.apache.isis.applib.query.Query;)">
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" name="AbstractDomainObject" location="50,129" size="183,29" id="org.apache.isis.applib/AbstractDomainObject">
- <children xsi:type="editmodel:CompartmentEditModel"/>
- <children xsi:type="editmodel:CompartmentEditModel"/>
- <children xsi:type="editmodel:CompartmentEditModel"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" targetConnections="//@children.2/@sourceConnections.0 //@children.4/@sourceConnections.0" autoLocated="true" id="org.apache.isis.applib/AbstractContainedObject<-org.apache.isis.applib/AbstractDomainObject" source="//@children.1" target="//@children.5" targetEnd="//@children.1/@sourceConnections.0/@children.1" sourceEnd="//@children.1/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
- <children xsi:type="editmodel:AssociationEndEditModel" location="91,0" anchorKind="FixedAtEdge" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel" location="99,29" anchorKind="FixedAtEdge"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" name="AbstractFixture" location="434,129" size="138,43" id="org.apache.isis.applib.fixtures/AbstractFixture" runTimeClassModel="laterDate(III),earlierTime(II),setService(Lorg.apache.isis.applib.fixtures.switchuser.SwitchUserService;),getType(),earlierDate(III),laterTime(II),fixtures,getFixtures(),setTime(II),getFixtureClock(),AbstractFixture(Lorg.apache.isis.applib.fixtures.FixtureType;),setDate(III),install(),AbstractFixture(),resetClock()">
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.applib/AbstractContainedObject<-org.apache.isis.applib.fixtures/AbstractFixture" source="//@children.2" target="//@children.1/@sourceConnections.0" targetEnd="//@children.2/@sourceConnections.0/@children.1" sourceEnd="//@children.2/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
- <children xsi:type="editmodel:AssociationEndEditModel" location="67,0" anchorKind="FixedAtEdge" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" name="AbstractFactoryAndRepository" location="232,195" size="232,29" id="org.apache.isis.applib/AbstractFactoryAndRepository">
- <children xsi:type="editmodel:CompartmentEditModel"/>
- <children xsi:type="editmodel:CompartmentEditModel"/>
- <children xsi:type="editmodel:CompartmentEditModel"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.applib/AbstractService<-org.apache.isis.applib/AbstractFactoryAndRepository" source="//@children.3" target="//@children.4" targetEnd="//@children.3/@sourceConnections.0/@children.1" sourceEnd="//@children.3/@sourceConnections.0/@children.0" connectionRouterKind="Manual">
- <children xsi:type="editmodel:AssociationEndEditModel" location="101,0" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel" location="70,29"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.3/@sourceConnections.0" name="AbstractService" location="263,129" size="141,29" id="org.apache.isis.applib/AbstractService" runTimeClassModel="">
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.applib/AbstractContainedObject<-org.apache.isis.applib/AbstractService" source="//@children.4" target="//@children.1/@sourceConnections.0" targetEnd="//@children.4/@sourceConnections.0/@children.1" sourceEnd="//@children.4/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
- <children xsi:type="editmodel:AssociationEndEditModel" location="70,0" anchorKind="FixedAtEdge" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.1/@sourceConnections.0" name="AbstractContainedObject" location="227,50" size="199,29" id="org.apache.isis.applib/AbstractContainedObject">
- <children xsi:type="editmodel:CompartmentEditModel"/>
- <children xsi:type="editmodel:CompartmentEditModel"/>
- <children xsi:type="editmodel:CompartmentEditModel"/>
- <sourceConnections xsi:type="editmodel:AssociationEditModel" autoLocated="true" id="org.apache.isis.applib/DomainObjectContainer@container+org.apache.isis.applib/AbstractContainedObject@" source="//@children.5" target="//@children.0" targetEnd="//@children.5/@sourceConnections.0/@children.2" label="//@children.5/@sourceConnections.0/@children.0" sourceEnd="//@children.5/@sourceConnections.0/@children.1" connectionRouterKind="Manhattan">
- <children xsi:type="editmodel:WireLabelEditModel" size="0,14" anchorKind="MiddlePart"/>
- <children xsi:type="editmodel:AssociationEndEditModel" location="199,14" id="org.apache.isis.applib/DomainObjectContainer@container+org.apache.isis.applib/AbstractContainedObject@|org.apache.isis.applib/AbstractContainedObject#" attachSource="true" roleLabel="//@children.5/@sourceConnections.0/@children.1/@children.0">
- <children xsi:type="editmodel:LabelEditModel" location="433,43" size="0,14" anchorKind="FirstPart"/>
- </children>
- <children xsi:type="editmodel:AssociationEndEditModel" name="container" location="0,21" id="org.apache.isis.applib/DomainObjectContainer@container+org.apache.isis.applib/AbstractContainedObject@|org.apache.isis.applib/DomainObjectContainer#container" multiplicityLabel="//@children.5/@sourceConnections.0/@children.2/@children.1" roleLabel="//@children.5/@sourceConnections.0/@children.2/@children.0" navigable="true">
- <children xsi:type="editmodel:LabelEditModel" name=" - container" location="493,43" size="55,14" anchorKind="LastPart"/>
- <children xsi:type="editmodel:LabelEditModel" name="0..1" location="530,71" size="18,14" anchorKind="LastPart"/>
- </children>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <diagramOptions xsi:type="options:ClassDiagramOptions" properties="wireOptions=1;Product=eUML2" autoName="false"/>
- <boardSetting snapToGeometry="true" gridEnabled="true" gridSpacing="15,15" gridOrigin="0,0" rulerUnit="pixel" gridVisibility="false">
- <leftRuler/>
- <topRuler/>
- </boardSetting>
- <classDiagramPreferences xsi:type="editmodel:UMLClassDiagramPreference" showPopupBars="true" showConnectionHandles="true" attributeSorter="Natural" methodSorter="Natural" showClassStereotype="true" showPackageStereotype="true" showDependencyStereotype="true" showInterfaceStereotype="true" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
-</editmodel:ClassDiagramEditModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<editmodel:ClassDiagramEditModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editmodel="editmodel.xmi" xmlns:options="options.xmi" name="AbstractContainedObject-hierarchy" size="843,745" id="org.apache.isis.applib" metadata="uml2-1.0" initialized="true" tag="1000" key="32303037303533312D31303030206170706C69622F64616E">
+ <children xsi:type="editmodel:InterfaceEditModel" targetConnections="//@children.5/@sourceConnections.0" name="DomainObjectContainer" location="555,43" size="194,43" id="org.apache.isis.applib/DomainObjectContainer" runTimeClassModel="commit(),firstMatch(Lorg.apache.isis.applib.query.Query;),warnUser(Ljava.lang.String;),isPersistent(Ljava.lang.Object;),newInstance(Ljava.lang.Class;Ljava.lang.Object;),removeIfNotAlready(Ljava.lang.Object;),raiseError(Ljava.lang.String;),uniqueMatch(Ljava.lang.Class;Lorg.apache.isis.applib.Filter;),isValid(Ljava.lang.Object;),allMatches(Ljava.lang.Class;Ljava.lang.String;),allInstances(Ljava.lang.Class;),informUser(Ljava.lang.String;),objectChanged(Ljava.lang.Object;),persistIfNotAlready(Ljava.lang.Object;),uniqueMatch(Ljava.lang.Class;Ljava.lang.String;),remove(Ljava.lang.Object;),resolve(Ljava.lang.Object;),allMatches(Lorg.apache.isis.applib.query.Query;),validate(Ljava.lang.Object;),firstMatch(Ljava.lang.Class;Lorg.apache.isis.applib.Filter;),fir
stMatch(Ljava.lang.Class;LT;),uniqueMatch(Ljava.lang.Class;LT;),newTransientInstance(Ljava.lang.Class;),resolve(Ljava.lang.Object;Ljava.lang.Object;),flush(),allMatches(Ljava.lang.Class;LT;),getPropertyNames(),allMatches(Ljava.lang.Class;Lorg.apache.isis.applib.Filter;),getProperty(Ljava.lang.String;Ljava.lang.String;),persist(Ljava.lang.Object;),firstMatch(Ljava.lang.Class;Ljava.lang.String;),getProperty(Ljava.lang.String;),newPersistentInstance(Ljava.lang.Class;),uniqueMatch(Lorg.apache.isis.applib.query.Query;)">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" name="AbstractDomainObject" location="50,129" size="183,29" id="org.apache.isis.applib/AbstractDomainObject">
+ <children xsi:type="editmodel:CompartmentEditModel"/>
+ <children xsi:type="editmodel:CompartmentEditModel"/>
+ <children xsi:type="editmodel:CompartmentEditModel"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" targetConnections="//@children.2/@sourceConnections.0 //@children.4/@sourceConnections.0" autoLocated="true" id="org.apache.isis.applib/AbstractContainedObject<-org.apache.isis.applib/AbstractDomainObject" source="//@children.1" target="//@children.5" targetEnd="//@children.1/@sourceConnections.0/@children.1" sourceEnd="//@children.1/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="91,0" anchorKind="FixedAtEdge" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel" location="99,29" anchorKind="FixedAtEdge"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" name="AbstractFixture" location="434,129" size="138,43" id="org.apache.isis.applib.fixtures/AbstractFixture" runTimeClassModel="laterDate(III),earlierTime(II),setService(Lorg.apache.isis.applib.fixtures.switchuser.SwitchUserService;),getType(),earlierDate(III),laterTime(II),fixtures,getFixtures(),setTime(II),getFixtureClock(),AbstractFixture(Lorg.apache.isis.applib.fixtures.FixtureType;),setDate(III),install(),AbstractFixture(),resetClock()">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.applib/AbstractContainedObject<-org.apache.isis.applib.fixtures/AbstractFixture" source="//@children.2" target="//@children.1/@sourceConnections.0" targetEnd="//@children.2/@sourceConnections.0/@children.1" sourceEnd="//@children.2/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="67,0" anchorKind="FixedAtEdge" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" name="AbstractFactoryAndRepository" location="232,195" size="232,29" id="org.apache.isis.applib/AbstractFactoryAndRepository">
+ <children xsi:type="editmodel:CompartmentEditModel"/>
+ <children xsi:type="editmodel:CompartmentEditModel"/>
+ <children xsi:type="editmodel:CompartmentEditModel"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.applib/AbstractService<-org.apache.isis.applib/AbstractFactoryAndRepository" source="//@children.3" target="//@children.4" targetEnd="//@children.3/@sourceConnections.0/@children.1" sourceEnd="//@children.3/@sourceConnections.0/@children.0" connectionRouterKind="Manual">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="101,0" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel" location="70,29"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.3/@sourceConnections.0" name="AbstractService" location="263,129" size="141,29" id="org.apache.isis.applib/AbstractService" runTimeClassModel="">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.applib/AbstractContainedObject<-org.apache.isis.applib/AbstractService" source="//@children.4" target="//@children.1/@sourceConnections.0" targetEnd="//@children.4/@sourceConnections.0/@children.1" sourceEnd="//@children.4/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="70,0" anchorKind="FixedAtEdge" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.1/@sourceConnections.0" name="AbstractContainedObject" location="227,50" size="199,29" id="org.apache.isis.applib/AbstractContainedObject">
+ <children xsi:type="editmodel:CompartmentEditModel"/>
+ <children xsi:type="editmodel:CompartmentEditModel"/>
+ <children xsi:type="editmodel:CompartmentEditModel"/>
+ <sourceConnections xsi:type="editmodel:AssociationEditModel" autoLocated="true" id="org.apache.isis.applib/DomainObjectContainer@container+org.apache.isis.applib/AbstractContainedObject@" source="//@children.5" target="//@children.0" targetEnd="//@children.5/@sourceConnections.0/@children.2" label="//@children.5/@sourceConnections.0/@children.0" sourceEnd="//@children.5/@sourceConnections.0/@children.1" connectionRouterKind="Manhattan">
+ <children xsi:type="editmodel:WireLabelEditModel" size="0,14" anchorKind="MiddlePart"/>
+ <children xsi:type="editmodel:AssociationEndEditModel" location="199,14" id="org.apache.isis.applib/DomainObjectContainer@container+org.apache.isis.applib/AbstractContainedObject@|org.apache.isis.applib/AbstractContainedObject#" attachSource="true" roleLabel="//@children.5/@sourceConnections.0/@children.1/@children.0">
+ <children xsi:type="editmodel:LabelEditModel" location="433,43" size="0,14" anchorKind="FirstPart"/>
+ </children>
+ <children xsi:type="editmodel:AssociationEndEditModel" name="container" location="0,21" id="org.apache.isis.applib/DomainObjectContainer@container+org.apache.isis.applib/AbstractContainedObject@|org.apache.isis.applib/DomainObjectContainer#container" multiplicityLabel="//@children.5/@sourceConnections.0/@children.2/@children.1" roleLabel="//@children.5/@sourceConnections.0/@children.2/@children.0" navigable="true">
+ <children xsi:type="editmodel:LabelEditModel" name=" - container" location="493,43" size="55,14" anchorKind="LastPart"/>
+ <children xsi:type="editmodel:LabelEditModel" name="0..1" location="530,71" size="18,14" anchorKind="LastPart"/>
+ </children>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <diagramOptions xsi:type="options:ClassDiagramOptions" properties="wireOptions=1;Product=eUML2" autoName="false"/>
+ <boardSetting snapToGeometry="true" gridEnabled="true" gridSpacing="15,15" gridOrigin="0,0" rulerUnit="pixel" gridVisibility="false">
+ <leftRuler/>
+ <topRuler/>
+ </boardSetting>
+ <classDiagramPreferences xsi:type="editmodel:UMLClassDiagramPreference" showPopupBars="true" showConnectionHandles="true" attributeSorter="Natural" methodSorter="Natural" showClassStereotype="true" showPackageStereotype="true" showDependencyStereotype="true" showInterfaceStereotype="true" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+</editmodel:ClassDiagramEditModel>