incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1226153 [1/2] - in /incubator/isis/trunk/framework: ./ core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ core/metamodel/src/main/java/org/apache/isis/core/...
Date Sat, 31 Dec 2011 18:10:54 GMT
Author: danhaywood
Date: Sat Dec 31 18:10:52 2011
New Revision: 1226153

URL: http://svn.apache.org/viewvc?rev=1226153&view=rev
Log:
ISIS-161: more on the embedded runtime example; also removed embedded runtime's dependency on oai.progmodels.wrapper

Added:
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/CglibEnhanced.java
      - copied, changed from r1225837, incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/CglibEnhanced.java
    incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisSchema.java
      - copied, changed from r1225837, incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisMetaModel.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject.java
      - copied, changed from r1225837, incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java
      - copied, changed from r1225837, incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject_transient.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Approver.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claim.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimItem.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepository.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepositoryImpl.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claimant.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/Employee.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepository.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepositoryImpl.java
    incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/PersistenceState.java
      - copied, changed from r1225837, incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/PersistenceState.java
    incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getDomainObjectContainer.java
      - copied, changed from r1225837, incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getWrapperFactory.java
Removed:
    incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisMetaModel.java
    incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/CglibEnhanced.java
    incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/PersistenceState.java
    incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getWrapperFactory.java
    incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject.java
    incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject_transient.java
Modified:
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java
    incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSchema.java
    incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
    incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XsMetaModel.java
    incubator/isis/trunk/framework/pom.xml
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/pom.xml
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/pom.xml
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
    incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/classsubstitutor/CglibClassSubstitutor.java
    incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
    incubator/isis/trunk/framework/runtimes/dflt/webserver/pom.xml
    incubator/isis/trunk/framework/runtimes/embedded/pom.xml
    incubator/isis/trunk/framework/runtimes/embedded/src/docbkx/guide/isis-embedded-runtime.xml
    incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java
    incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java
    incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java
    incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java
    incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/ServiceAdapter.java
    incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java
    incubator/isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch
    incubator/isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch
    incubator/isis/trunk/framework/viewer/json/json-tck/ide/eclipse/launch/viewer-json-tck.launch
    incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch
    incubator/isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java Sat Dec 31 18:10:52 2011
@@ -21,6 +21,13 @@ import java.util.List;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
+/**
+ * Orders both associations (properties and collections) and also actions.
+ *
+ * <p>
+ * TODO: for now, 'arranging' means merely ordering.  In the future, this might evolve into a more general specification
+ * of a layout, eg columns and other layouts.
+ */
 public interface MemberLayoutArranger {
 
     OrderSet createAssociationOrderSetFor(ObjectSpecification objectSpecification, List<FacetedMethod> associationFacetedMethods);

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java Sat Dec 31 18:10:52 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.spec;
 
-import java.util.Collection;
 import java.util.List;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;

Copied: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/CglibEnhanced.java (from r1225837, incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/CglibEnhanced.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/CglibEnhanced.java?p2=incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/CglibEnhanced.java&p1=incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/CglibEnhanced.java&r1=1225837&r2=1226153&rev=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/CglibEnhanced.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/CglibEnhanced.java Sat Dec 31 18:10:52 2011
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-package org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.internal;
-
-import org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor;
+package org.apache.isis.core.metamodel.specloader.classsubstitutor;
 
 /**
- * Marker interface that we make entities implement so easy to spot in the {@link CglibClassSubstitutor}.
+ * Marker interface to make it easy to spot classes that have been generated by cg-lib.
  */
 public interface CglibEnhanced {
 

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java Sat Dec 31 18:10:52 2011
@@ -24,13 +24,16 @@ import org.apache.isis.core.commons.comp
 import org.apache.isis.core.metamodel.spec.feature.OneToManyFeature.CollectionSemantics;
 
 /**
- * TODO: plan is to allow new collection types to be installed dynamically, allowing the domain programmer to declare
- * custom classes to have collection semantics.
+ * Defines the types which are considered to be collections.
  * 
  * <p>
  * In this way there are similarities with the way in which value types are specified using <tt>@Value</tt>. However, we
  * need to maintain a repository of these collection types once nominated so that when we introspect classes we look for
  * collections first, and then properties second.
+ *
+ * <p>
+ * TODO: plan is to allow new collection types to be installed dynamically, allowing the domain programmer to declare
+ * custom classes to have collection semantics.
  */
 public interface CollectionTypeRegistry extends Injectable, ApplicationScopedComponent {
 

Copied: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisSchema.java (from r1225837, incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisMetaModel.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisSchema.java?p2=incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisSchema.java&p1=incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisMetaModel.java&r1=1225837&r2=1226153&rev=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisMetaModel.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/IsisSchema.java Sat Dec 31 18:10:52 2011
@@ -29,15 +29,15 @@ import org.w3c.dom.Element;
 
 
 /**
- * Stateless utility methods relating to the NOF meta model.
+ * Utility methods relating to the Isis meta model.
  */
-final class IsisMetaModel {
+final class IsisSchema {
 
     /**
      * The generated XML schema references the NOF metamodel schema. This is the default location for this
      * schema.
      */
-    public static final String DEFAULT_NOF_SCHEMA_LOCATION = "isis.xsd";
+    public static final String DEFAULT_LOCATION = "isis.xsd";
     /**
      * The base of the namespace URI to use for application namespaces if none explicitly supplied in the
      * constructor.
@@ -45,43 +45,43 @@ final class IsisMetaModel {
     public final static String DEFAULT_URI_BASE = "http://isis.apache.org/ns/app/";
 
     /**
-     * Enumeration of nof:feature attribute representing a class
+     * Enumeration of isis:feature attribute representing a class
      */
-    public static final String NOF_METAMODEL_FEATURE_CLASS = "class";
+    public static final String FEATURE_CLASS = "class";
     /**
-     * Enumeration of nof:feature attribute representing a collection (1:n association)
+     * Enumeration of isis:feature attribute representing a collection (1:n association)
      */
-    public static final String NOF_METAMODEL_FEATURE_COLLECTION = "collection";
+    public static final String FEATURE_COLLECTION = "collection";
     /**
-     * Enumeration of nof:feature attribute representing a reference (1:1 association)
+     * Enumeration of isis:feature attribute representing a reference (1:1 association)
      */
-    public static final String NOF_METAMODEL_FEATURE_REFERENCE = "reference";
+    public static final String FEATURE_REFERENCE = "reference";
     /**
-     * Enumeration of nof:feature attribute representing a value field
+     * Enumeration of isis:feature attribute representing a value field
      */
-    public static final String NOF_METAMODEL_FEATURE_VALUE = "value";
+    public static final String FEATURE_VALUE = "value";
     /**
-     * Namespace prefix for {@link NOF_METAMODEL_NS_URI}.
+     * Namespace prefix for {@link NS_URI}.
      * 
      * The NamespaceManager will not allow any namespace to use this prefix.
      */
-    public static final String NOF_METAMODEL_NS_PREFIX = "nof";
+    public static final String NS_PREFIX = "nof";
     /**
      * URI representing the namespace of ObjectAdapter framework's metamodel.
      * 
      * The NamespaceManager will not allow any namespaces with this URI to be added.
      */
-    public static final String NOF_METAMODEL_NS_URI = "http://isis.apache.org/ns/0.1/metamodel";
+    public static final String NS_URI = "http://isis.apache.org/ns/0.1/metamodel";
 
     private final Helper helper;
 
-    public IsisMetaModel() {
+    public IsisSchema() {
         this.helper = new Helper();
     }
 
     void addNamespace(final Element element) {
         helper.rootElementFor(element).setAttributeNS(XsMetaModel.W3_ORG_XMLNS_URI,
-                XsMetaModel.W3_ORG_XMLNS_PREFIX + ":" + IsisMetaModel.NOF_METAMODEL_NS_PREFIX, IsisMetaModel.NOF_METAMODEL_NS_URI);
+                XsMetaModel.W3_ORG_XMLNS_PREFIX + ":" + IsisSchema.NS_PREFIX, IsisSchema.NS_URI);
     }
 
     /**
@@ -89,8 +89,8 @@ final class IsisMetaModel {
      * if required.
      */
     Element appendElement(final Element parentElement, final String localName) {
-        final Element element = helper.docFor(parentElement).createElementNS(IsisMetaModel.NOF_METAMODEL_NS_URI,
-                IsisMetaModel.NOF_METAMODEL_NS_PREFIX + ":" + localName);
+        final Element element = helper.docFor(parentElement).createElementNS(IsisSchema.NS_URI,
+                IsisSchema.NS_PREFIX + ":" + localName);
         parentElement.appendChild(element);
         // addNamespace(parentElement);
         return element;
@@ -106,33 +106,33 @@ final class IsisMetaModel {
     }
 
     /**
-     * Gets an attribute with the supplied name in the NOF namespace from the supplied element
+     * Gets an attribute with the supplied name in the Isis namespace from the supplied element
      */
     String getAttribute(final Element element, final String attributeName) {
-        return element.getAttributeNS(IsisMetaModel.NOF_METAMODEL_NS_URI, attributeName);
+        return element.getAttributeNS(IsisSchema.NS_URI, attributeName);
     }
 
     /**
-     * Adds an <code>nof:annotation</code> attribute for the supplied class to the supplied element.
+     * Adds an <code>isis:annotation</code> attribute for the supplied class to the supplied element.
      */
     void setAnnotationAttribute(final Element element, final String annotation) {
-        setAttribute(element, "annotation", IsisMetaModel.NOF_METAMODEL_NS_PREFIX + ":" + annotation);
+        setAttribute(element, "annotation", IsisSchema.NS_PREFIX + ":" + annotation);
     }
 
     /**
-     * Sets an attribute of the supplied element with the attribute being in the NOF namespace.
+     * Sets an attribute of the supplied element with the attribute being in the Isis namespace.
      */
     private void setAttribute(final Element element, final String attributeName, final String attributeValue) {
-        element.setAttributeNS(IsisMetaModel.NOF_METAMODEL_NS_URI, IsisMetaModel.NOF_METAMODEL_NS_PREFIX + ":" + attributeName,
+        element.setAttributeNS(IsisSchema.NS_URI, IsisSchema.NS_PREFIX + ":" + attributeName,
                 attributeValue);
     }
 
     /**
-     * Adds <code>nof:feature=&quot;class&quot;</code> attribute and <code>nof:oid=&quote;...&quot;</code>
+     * Adds <code>isis:feature=&quot;class&quot;</code> attribute and <code>isis:oid=&quote;...&quot;</code>
      * for the supplied element.
      */
     void setAttributesForClass(final Element element, final String oid) {
-        setAttribute(element, "feature", NOF_METAMODEL_FEATURE_CLASS);
+        setAttribute(element, "feature", FEATURE_CLASS);
         setAttribute(element, "oid", oid);
     }
 
@@ -141,7 +141,7 @@ final class IsisMetaModel {
      * <code>nof:type=&quote;...&quot;</code> for the supplied element.
      */
     void setAttributesForReference(final Element element, final String prefix, final String fullyQualifiedClassName) {
-        setAttribute(element, "feature", NOF_METAMODEL_FEATURE_REFERENCE);
+        setAttribute(element, "feature", FEATURE_REFERENCE);
         setAttribute(element, "type", prefix + ":" + fullyQualifiedClassName);
     }
 
@@ -150,8 +150,8 @@ final class IsisMetaModel {
      * <code>nof:datatype=&quote;...&quot;</code> for the supplied element.
      */
     void setAttributesForValue(final Element element, final String datatypeName) {
-        setAttribute(element, "feature", NOF_METAMODEL_FEATURE_VALUE);
-        setAttribute(element, "datatype", IsisMetaModel.NOF_METAMODEL_NS_PREFIX + ":" + datatypeName);
+        setAttribute(element, "feature", FEATURE_VALUE);
+        setAttribute(element, "datatype", IsisSchema.NS_PREFIX + ":" + datatypeName);
     }
 
     /**
@@ -169,12 +169,12 @@ final class IsisMetaModel {
      * Additionally, if the <code>addOids</code> parameter is set, also adds <code>&lt;oids&gt;</code>
      * child elements.
      */
-    void setNofCollection(
+    void setIsisCollection(
             final Element element,
             final String prefix,
             final String fullyQualifiedClassName,
             final ObjectAdapter collection) {
-        setAttribute(element, "feature", NOF_METAMODEL_FEATURE_COLLECTION);
+        setAttribute(element, "feature", FEATURE_COLLECTION);
         setAttribute(element, "type", prefix + ":" + fullyQualifiedClassName);
         final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
         setAttribute(element, "size", "" + facet.size(collection));

Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSchema.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSchema.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSchema.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSchema.java Sat Dec 31 18:10:52 2011
@@ -39,7 +39,7 @@ public final class XmlSchema {
     private final String uriBase;
     private String uri;
 
-    private final IsisMetaModel nofMeta;
+    private final IsisSchema nofMeta;
     private final XsMetaModel xsMeta;
     private final Helper helper;
 
@@ -49,7 +49,7 @@ public final class XmlSchema {
     public final static String DEFAULT_PREFIX = "app";
 
     public XmlSchema() {
-        this(IsisMetaModel.DEFAULT_URI_BASE, XmlSchema.DEFAULT_PREFIX);
+        this(IsisSchema.DEFAULT_URI_BASE, XmlSchema.DEFAULT_PREFIX);
     }
 
     /**
@@ -59,7 +59,7 @@ public final class XmlSchema {
      *            the prefix for the application namespace's prefix
      */
     public XmlSchema(final String uriBase, final String prefix) {
-        this.nofMeta = new IsisMetaModel();
+        this.nofMeta = new IsisSchema();
         this.xsMeta = new XsMetaModel();
         this.helper = new Helper();
 
@@ -82,10 +82,10 @@ public final class XmlSchema {
         if (XsMetaModel.W3_ORG_XSI_PREFIX.equals(prefix)) {
             throw new IllegalArgumentException("Namespace prefix reserved for w3.org XML schema-instance namespace.");
         }
-        if (IsisMetaModel.NOF_METAMODEL_NS_URI.equals(base)) {
+        if (IsisSchema.NS_URI.equals(base)) {
             throw new IllegalArgumentException("Namespace URI reserved for NOF metamodel namespace.");
         }
-        if (IsisMetaModel.NOF_METAMODEL_NS_PREFIX.equals(prefix)) {
+        if (IsisSchema.NS_PREFIX.equals(prefix)) {
             throw new IllegalArgumentException("Namespace prefix reserved for NOF metamodel namespace.");
         }
         this.uriBase = base;
@@ -148,9 +148,9 @@ public final class XmlSchema {
             final String singularName,
             final String pluralName) {
         final Element element = doc.createElementNS(getUri(), getPrefix() + ":" + localName);
-        element.setAttributeNS(IsisMetaModel.NOF_METAMODEL_NS_URI, "nof:fqn", fullyQualifiedClassName);
-        element.setAttributeNS(IsisMetaModel.NOF_METAMODEL_NS_URI, "nof:singular", singularName);
-        element.setAttributeNS(IsisMetaModel.NOF_METAMODEL_NS_URI, "nof:plural", pluralName);
+        element.setAttributeNS(IsisSchema.NS_URI, "nof:fqn", fullyQualifiedClassName);
+        element.setAttributeNS(IsisSchema.NS_URI, "nof:singular", singularName);
+        element.setAttributeNS(IsisSchema.NS_URI, "nof:plural", pluralName);
         nofMeta.addNamespace(element); // good a place as any
 
         addNamespace(element, getPrefix(), getUri());
@@ -211,7 +211,7 @@ public final class XmlSchema {
 
         // xs:element/xs:complexType/xs:sequence/xs:element ref="nof:title"
         final Element xsTitleElement = xsMeta.createXsElement(helper.docFor(xsSequenceElement), "element");
-        xsTitleElement.setAttribute("ref", IsisMetaModel.NOF_METAMODEL_NS_PREFIX + ":" + "title");
+        xsTitleElement.setAttribute("ref", IsisSchema.NS_PREFIX + ":" + "title");
         xsSequenceElement.appendChild(xsTitleElement);
         xsMeta.setXsCardinality(xsTitleElement, 0, 1);
 
@@ -302,7 +302,7 @@ public final class XmlSchema {
             final Hashtable extensions) {
 
         // gather details from XML element
-        final String datatype = xmlValueElement.getAttributeNS(IsisMetaModel.NOF_METAMODEL_NS_URI, "datatype");
+        final String datatype = xmlValueElement.getAttributeNS(IsisSchema.NS_URI, "datatype");
         final String fieldName = xmlValueElement.getLocalName();
 
         // <xs:element name="%owning object%">
@@ -434,7 +434,7 @@ public final class XmlSchema {
         // xs:element/xs:complexType/xs:sequence/xs:element/xs:complexType/xs:sequence/xs:element
         // ref="nof:title"
         final Element xsFieldTitleElement = xsMeta.createXsElement(helper.docFor(xsFieldSequenceElement), "element");
-        xsFieldTitleElement.setAttribute("ref", IsisMetaModel.NOF_METAMODEL_NS_PREFIX + ":" + "title");
+        xsFieldTitleElement.setAttribute("ref", IsisSchema.NS_PREFIX + ":" + "title");
         xsFieldSequenceElement.appendChild(xsFieldTitleElement);
         xsMeta.setXsCardinality(xsFieldTitleElement, 0, 1);
 
@@ -503,7 +503,7 @@ public final class XmlSchema {
         // xs:element/xs:complexType/xs:sequence/xs:element/xs:complexType/xs:sequence/xs:element
         // ref="nof:oids"
         final Element xsFieldOidsElement = xsMeta.createXsElement(helper.docFor(xsFieldSequenceElement), "element");
-        xsFieldOidsElement.setAttribute("ref", IsisMetaModel.NOF_METAMODEL_NS_PREFIX + ":" + "oids");
+        xsFieldOidsElement.setAttribute("ref", IsisSchema.NS_PREFIX + ":" + "oids");
         xsFieldSequenceElement.appendChild(xsFieldOidsElement);
         xsMeta.setXsCardinality(xsFieldOidsElement, 0, 1);
 

Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java Sat Dec 31 18:10:52 2011
@@ -71,7 +71,7 @@ public class XmlSnapshot {
 
     private static final Logger LOG = Logger.getLogger(XmlSnapshot.class);
 
-    private final IsisMetaModel isisMetaModel;
+    private final IsisSchema isisMetaModel;
 
     private final Place rootPlace;
 
@@ -113,7 +113,7 @@ public class XmlSnapshot {
     		LOG.debug(".ctor(" + log("rootObj", rootAdapter) + andlog("schema", schema) + andlog("addOids", "" + true) + ")");
     	}
 
-        this.isisMetaModel = new IsisMetaModel();
+        this.isisMetaModel = new IsisSchema();
         this.xsMeta = new XsMetaModel();
 
         this.schema = schema;
@@ -751,7 +751,7 @@ public class XmlSnapshot {
                     final String fullyQualifiedClassName = referencedTypeNos.getFullIdentifier();
 
                     // XML
-                    isisMetaModel.setNofCollection(xmlCollectionElement, schema.getPrefix(), fullyQualifiedClassName, collection);
+                    isisMetaModel.setIsisCollection(xmlCollectionElement, schema.getPrefix(), fullyQualifiedClassName, collection);
                 } catch (final Exception ex) {
                     LOG.warn("objectToElement(NO): " + log("field", fieldName)
                             + ": get(obj) threw exception - skipping XML generation");

Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XsMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XsMetaModel.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XsMetaModel.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XsMetaModel.java Sat Dec 31 18:10:52 2011
@@ -64,11 +64,11 @@ public final class XsMetaModel {
      */
     public static final String W3_ORG_XSI_PREFIX = "xsi";
 
-    private final IsisMetaModel nofMeta;
+    private final IsisSchema nofMeta;
 
     public XsMetaModel() {
         this.helper = new Helper();
-        this.nofMeta = new IsisMetaModel();
+        this.nofMeta = new IsisSchema();
     }
 
     /**
@@ -94,8 +94,8 @@ public final class XsMetaModel {
 
         xsdDoc.appendChild(xsSchemaElement);
         final Element xsImportElement = createXsElement(xsdDoc, "import");
-        xsImportElement.setAttribute("namespace", IsisMetaModel.NOF_METAMODEL_NS_URI);
-        xsImportElement.setAttribute("schemaLocation", IsisMetaModel.DEFAULT_NOF_SCHEMA_LOCATION);
+        xsImportElement.setAttribute("namespace", IsisSchema.NS_URI);
+        xsImportElement.setAttribute("schemaLocation", IsisSchema.DEFAULT_LOCATION);
 
         xsSchemaElement.appendChild(xsImportElement);
 
@@ -166,7 +166,7 @@ public final class XsMetaModel {
             final String value,
             final boolean useFixed) {
         final Element xsNofAttributeElement = createXsElement(helper.docFor(parentXsElement), "attribute");
-        xsNofAttributeElement.setAttribute("ref", IsisMetaModel.NOF_METAMODEL_NS_PREFIX + ":" + nofAttributeRef);
+        xsNofAttributeElement.setAttribute("ref", IsisSchema.NS_PREFIX + ":" + nofAttributeRef);
         parentXsElement.appendChild(xsNofAttributeElement);
         if (value != null) {
             if (useFixed) {

Modified: incubator/isis/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/pom.xml?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/pom.xml (original)
+++ incubator/isis/trunk/framework/pom.xml Sat Dec 31 18:10:52 2011
@@ -1174,8 +1174,21 @@ archetype includes this explicit depende
             <dependency>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty</artifactId>
-                <version>6.1.24</version>
+                <version>6.1.25</version>
             </dependency>
+			<dependency>
+		        <groupId>org.mortbay.jetty</groupId>
+		        <artifactId>jsp-2.1</artifactId>
+		        <version>6.1.14</version>
+		        <type>jar</type>
+		    </dependency>
+		    <dependency>
+		        <groupId>org.mortbay.jetty</groupId>
+		        <artifactId>jsp-api-2.1</artifactId>
+		        <version>6.1.14</version>
+		        <type>jar</type>
+		    </dependency>
+            
             <dependency>
                 <groupId>org.htmlparser</groupId>
                 <artifactId>htmlparser</artifactId>

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/pom.xml?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/pom.xml (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/pom.xml Sat Dec 31 18:10:52 2011
@@ -69,8 +69,8 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.isis.runtimes.dflt</groupId>
-			<artifactId>runtime</artifactId>
+			<groupId>org.apache.isis</groupId>
+			<artifactId>applib</artifactId>
         </dependency>
 	</dependencies>
 

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java Sat Dec 31 18:10:52 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.progmodel.wrapper.applib;
 
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 /**
  * Implemented by all objects that have been viewed as per {@link WrapperFactory#wrap(Object)}.
@@ -36,7 +35,7 @@ public interface WrapperObject {
      * Provide access to the underlying, wrapped object.
      * 
      * <p>
-     * Used to unwrap objects used as arguments to actions (otherwise, end up creating a {@link ObjectSpecification} for
+     * Used to unwrap objects used as arguments to actions (otherwise, end up creating a <tt>ObjectSpecification</tt> for
      * the CGLib-enhanced class, not the original class).
      * 
      * <p>

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/pom.xml?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/pom.xml (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/pom.xml Sat Dec 31 18:10:52 2011
@@ -104,6 +104,12 @@
 			<artifactId>cglib-nodep</artifactId>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>testsupport</artifactId>
+            <scope>test</scope>
+        </dependency>
+
 	</dependencies>
 
 </project>

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java Sat Dec 31 18:10:52 2011
@@ -26,8 +26,8 @@ import java.util.List;
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.Factory;
 
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.CglibEnhanced;
 import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
-import org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.internal.CglibEnhanced;
 
 public class CgLibProxy<T> {
 

Copied: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject.java (from r1225837, incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject.java?p2=incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject.java&p1=incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject.java&r1=1225837&r2=1226153&rev=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject.java Sat Dec 31 18:10:52 2011
@@ -17,52 +17,42 @@
  *  under the License.
  */
 
-package org.apache.isis.runtimes.embedded;
+package org.apache.isis.progmodel.wrapper;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
+import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
 import org.apache.isis.progmodel.wrapper.applib.DisabledException;
 import org.apache.isis.progmodel.wrapper.applib.HiddenException;
 import org.apache.isis.progmodel.wrapper.applib.InvalidException;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
-import org.apache.isis.runtimes.embedded.dom.claim.ClaimRepository;
-import org.apache.isis.runtimes.embedded.dom.claim.ClaimRepositoryImpl;
-import org.apache.isis.runtimes.embedded.dom.employee.Employee;
-import org.apache.isis.runtimes.embedded.dom.employee.EmployeeRepository;
-import org.apache.isis.runtimes.embedded.dom.employee.EmployeeRepositoryImpl;
-import org.apache.isis.runtimes.embedded.internal.PersistenceState;
+import org.apache.isis.progmodel.wrapper.dom.claim.ClaimRepository;
+import org.apache.isis.progmodel.wrapper.dom.claim.ClaimRepositoryImpl;
+import org.apache.isis.progmodel.wrapper.dom.employee.Employee;
+import org.apache.isis.progmodel.wrapper.dom.employee.EmployeeRepository;
+import org.apache.isis.progmodel.wrapper.dom.employee.EmployeeRepositoryImpl;
+import org.apache.isis.progmodel.wrapper.metamodel.internal.WrapperFactoryDefault;
 import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Before;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
-@RunWith(JMock.class)
 public class WrappedFactoryDefaultTest_wrappedObject {
 
-//    @Rule
-//    public JMockRule rule = new JMockRule();
+    @Rule
+    public JUnitRuleMockery2 mockery = JUnitRuleMockery2.createFor(Mode.INTERFACES_ONLY);
     
-    private final Mockery mockery = new JUnit4Mockery();
-
-    // @Mock
-    private EmbeddedContext mockContext;
-    // @Mock
-    private AuthenticationSession mockAuthenticationSession;
-
     private EmployeeRepository employeeRepository;
     private ClaimRepository claimRepository;
     
     private Employee employeeDO;
     private Employee employeeWO;
 
-    private IsisMetaModel metaModel;
     private WrapperFactory wrapperFactory;
 
     
@@ -76,36 +66,19 @@ public class WrappedFactoryDefaultTest_w
         employeeDO.setName("Smith");
         employeeDO.setEmployeeRepository(employeeRepository); // would be done by the EmbeddedContext impl
 
-        mockContext = mockery.mock(EmbeddedContext.class);
-        mockAuthenticationSession = mockery.mock(AuthenticationSession.class);
-
-        mockery.checking(new Expectations() {
-            {
-                allowing(mockContext).getPersistenceState(with(any(Employee.class)));
-                will(returnValue(PersistenceState.PERSISTENT));
-
-                allowing(mockContext).getPersistenceState(with(any(String.class)));
-                will(returnValue(PersistenceState.STANDALONE));
-
-                allowing(mockContext).getAuthenticationSession();
-                will(returnValue(mockAuthenticationSession));
-            }
-        });
-
-        metaModel = new IsisMetaModel(mockContext, employeeRepository, claimRepository);
-        metaModel.init();
 
-        //employeeDO.setEmployeeRepository(employeeRepository);
-        wrapperFactory = metaModel.getWrapperFactory();
+        wrapperFactory = new WrapperFactoryDefault();
         employeeWO = wrapperFactory.wrap(employeeDO);
     }
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test
     public void shouldWrapDomainObject() {
         // then
         assertThat(employeeWO, is(notNullValue()));
     }
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test
     public void shouldBeAbleToInjectIntoDomainObjects() {
 
@@ -117,12 +90,14 @@ public class WrappedFactoryDefaultTest_w
     }
 
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test
     public void shouldBeAbleToReadVisibleProperty() {
         // then
         assertThat(employeeWO.getName(), is(employeeDO.getName()));
     }
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test(expected = HiddenException.class)
     public void shouldNotBeAbleToViewHiddenProperty() {
         // given
@@ -132,6 +107,7 @@ public class WrappedFactoryDefaultTest_w
         // then should throw exception
     }
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test
     public void shouldBeAbleToModifyEnabledPropertyUsingSetter() {
         // when
@@ -141,6 +117,7 @@ public class WrappedFactoryDefaultTest_w
         assertThat(employeeWO.getName(), is(employeeDO.getName()));
     }
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test(expected = DisabledException.class)
     public void shouldNotBeAbleToModifyDisabledProperty() {
         // given
@@ -150,6 +127,7 @@ public class WrappedFactoryDefaultTest_w
         // then should throw exception
     }
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test(expected = UnsupportedOperationException.class)
     public void shouldNotBeAbleToModifyPropertyUsingModify() {
         // when
@@ -157,6 +135,7 @@ public class WrappedFactoryDefaultTest_w
         // then should throw exception
     }
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test(expected = UnsupportedOperationException.class)
     public void shouldNotBeAbleToModifyPropertyUsingClear() {
         // when
@@ -164,6 +143,7 @@ public class WrappedFactoryDefaultTest_w
         // then should throw exception
     }
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test(expected = InvalidException.class)
     public void shouldNotBeAbleToModifyPropertyIfInvalid() {
         // given

Copied: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java (from r1225837, incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject_transient.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java?p2=incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java&p1=incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject_transient.java&r1=1225837&r2=1226153&rev=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/WrappedFactoryDefaultTest_wrappedObject_transient.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java Sat Dec 31 18:10:52 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtimes.embedded;
+package org.apache.isis.progmodel.wrapper;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -27,15 +27,15 @@ import org.apache.isis.core.testsupport.
 import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
 import org.apache.isis.progmodel.wrapper.applib.DisabledException;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
-import org.apache.isis.runtimes.embedded.dom.claim.ClaimRepository;
-import org.apache.isis.runtimes.embedded.dom.claim.ClaimRepositoryImpl;
-import org.apache.isis.runtimes.embedded.dom.employee.Employee;
-import org.apache.isis.runtimes.embedded.dom.employee.EmployeeRepository;
-import org.apache.isis.runtimes.embedded.dom.employee.EmployeeRepositoryImpl;
-import org.apache.isis.runtimes.embedded.internal.PersistenceState;
-import org.jmock.Expectations;
+import org.apache.isis.progmodel.wrapper.dom.claim.ClaimRepository;
+import org.apache.isis.progmodel.wrapper.dom.claim.ClaimRepositoryImpl;
+import org.apache.isis.progmodel.wrapper.dom.employee.Employee;
+import org.apache.isis.progmodel.wrapper.dom.employee.EmployeeRepository;
+import org.apache.isis.progmodel.wrapper.dom.employee.EmployeeRepositoryImpl;
+import org.apache.isis.progmodel.wrapper.metamodel.internal.WrapperFactoryDefault;
 import org.jmock.auto.Mock;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -45,8 +45,6 @@ public class WrappedFactoryDefaultTest_w
     public final JUnitRuleMockery2 mockery = JUnitRuleMockery2.createFor(Mode.INTERFACES_ONLY);
 
     @Mock
-    private EmbeddedContext mockContext;
-    @Mock
     private AuthenticationSession mockAuthenticationSession;
 
     private EmployeeRepository employeeRepository;
@@ -55,7 +53,6 @@ public class WrappedFactoryDefaultTest_w
     private Employee employeeDO;
     private Employee employeeWO;
 
-    private IsisMetaModel metaModel;
     private WrapperFactory wrapperFactory;
 
     
@@ -68,14 +65,19 @@ public class WrappedFactoryDefaultTest_w
         employeeDO = new Employee();
         employeeDO.setName("Smith");
         employeeDO.setEmployeeRepository(employeeRepository); // would be done by the EmbeddedContext impl
+
+        wrapperFactory = new WrapperFactoryDefault();
+
+        employeeWO = wrapperFactory.wrap(employeeDO);
     }
 
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test(expected = DisabledException.class)
     public void shouldNotBeAbleToModifyPropertyIfPersistent() {
         
         // given
-        initializedMetaModelWhereEmployeeIs(PersistenceState.PERSISTENT);
+        //initializedMetaModelWhereEmployeeIs(PersistenceState.PERSISTENT);
         
         // when
         employeeWO.setPassword("12345678");
@@ -83,10 +85,11 @@ public class WrappedFactoryDefaultTest_w
     }
 
 
+    @Ignore("TODO - moved from embedded runtime, need to re-enable")
     @Test
     public void canModifyPropertyIfTransient() {
         // given
-        initializedMetaModelWhereEmployeeIs(PersistenceState.TRANSIENT);
+        //initializedMetaModelWhereEmployeeIs(PersistenceState.TRANSIENT);
         
         // when
         employeeWO.setPassword("12345678");
@@ -95,29 +98,5 @@ public class WrappedFactoryDefaultTest_w
     }
 
     
-    private void initializedMetaModelWhereEmployeeIs(final PersistenceState persistentState) {
-        mockery.checking(new Expectations() {
-            {
-                allowing(mockContext).getPersistenceState(with(any(Employee.class)));
-                will(returnValue(persistentState));
-            }
-        });
-        mockery.checking(new Expectations() {
-            {
-                allowing(mockContext).getPersistenceState(with(any(String.class)));
-                will(returnValue(PersistenceState.STANDALONE));
-
-                allowing(mockContext).getAuthenticationSession();
-                will(returnValue(mockAuthenticationSession));
-            }
-        });
-        metaModel = new IsisMetaModel(mockContext, employeeRepository, claimRepository);
-        metaModel.init();
-
-        wrapperFactory = metaModel.getWrapperFactory();
-
-        employeeWO = wrapperFactory.wrap(employeeDO);
-    }
-
 
 }

Added: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Approver.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Approver.java?rev=1226153&view=auto
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Approver.java (added)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Approver.java Sat Dec 31 18:10:52 2011
@@ -0,0 +1,24 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.progmodel.wrapper.dom.claim;
+
+public interface Approver {
+
+}

Added: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claim.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claim.java?rev=1226153&view=auto
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claim.java (added)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claim.java Sat Dec 31 18:10:52 2011
@@ -0,0 +1,239 @@
+/*
+ *  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.progmodel.wrapper.dom.claim;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.isis.applib.AbstractDomainObject;
+import org.apache.isis.applib.annotation.Disabled;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.value.Color;
+import org.apache.isis.applib.value.Date;
+
+public class Claim extends AbstractDomainObject {
+
+    // {{ Title
+    public String title() {
+        return getStatus() + " - " + getDate();
+    }
+
+    // }}
+
+    // {{ Lifecycle
+    public void created() {
+        status = "New";
+        date = new Date();
+    }
+
+    // }}
+
+    // {{ Description
+    private String description;
+
+    @MemberOrder(sequence = "1")
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(final String description) {
+        this.description = description;
+    }
+
+    public String defaultDescription() {
+        return "enter a description here";
+    }
+
+    // }}
+
+    // {{ Date
+    private Date date;
+
+    @MemberOrder(sequence = "2")
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(final Date date) {
+        this.date = date;
+    }
+
+    // }}
+
+    // {{ Status
+    private String status;
+
+    @Disabled
+    @MemberOrder(sequence = "3")
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(final String status) {
+        this.status = status;
+    }
+
+    // }}
+
+    // {{ Claimant
+    private Claimant claimant;
+
+    @Disabled
+    @MemberOrder(sequence = "4")
+    public Claimant getClaimant() {
+        return claimant;
+    }
+
+    public void setClaimant(final Claimant claimant) {
+        this.claimant = claimant;
+    }
+
+    // }}
+
+    // {{ BigDecimal
+    private BigDecimal bigDecimal;
+
+    @MemberOrder(sequence = "9")
+    public BigDecimal getBigDecimal() {
+        return bigDecimal;
+    }
+
+    public void setBigDecimal(final BigDecimal bigDecimal) {
+        this.bigDecimal = bigDecimal;
+    }
+
+    public void modifyBigDecimal(final BigDecimal bigDecimal) {
+        // check for no-op
+        if (bigDecimal == null || bigDecimal.equals(getBigDecimal())) {
+            return;
+        }
+        // associate new
+        setBigDecimal(bigDecimal);
+        // additional business logic
+        onModifyBigDecimal(bigDecimal);
+    }
+
+    public void clearBigDecimal() {
+        // check for no-op
+        if (getBigDecimal() == null) {
+            return;
+        }
+        // dissociate existing
+        setBigDecimal(null);
+        // additional business logic
+        onClearBigDecimal();
+    }
+
+    protected void onModifyBigDecimal(final BigDecimal bigDecimal) {
+    }
+
+    protected void onClearBigDecimal() {
+    }
+
+    // }}
+
+    // {{ Color
+    private Color color;
+
+    @MemberOrder(sequence = "8")
+    public Color getColor() {
+        return color;
+    }
+
+    public void setColor(final Color color) {
+        this.color = color;
+    }
+
+    public void modifyColor(final Color color) {
+        // check for no-op
+        if (color == null || color.equals(getColor())) {
+            return;
+        }
+        // associate new
+        setColor(color);
+        // additional business logic
+        onModifyColor(color);
+    }
+
+    public void clearColor() {
+        // check for no-op
+        if (getColor() == null) {
+            return;
+        }
+        // dissociate existing
+        setColor(null);
+        // additional business logic
+        onClearColor();
+    }
+
+    protected void onModifyColor(final Color color) {
+    }
+
+    protected void onClearColor() {
+    }
+
+    // }}
+
+    // {{ Approver
+    private Approver approver;
+
+    @Disabled
+    @MemberOrder(sequence = "5")
+    public Approver getApprover() {
+        return approver;
+    }
+
+    public void setApprover(final Approver approver) {
+        this.approver = approver;
+    }
+
+    // }}
+
+    // {{ Items
+    private final List<ClaimItem> items = new ArrayList<ClaimItem>();
+
+    @MemberOrder(sequence = "6")
+    public List<ClaimItem> getItems() {
+        return items;
+    }
+
+    public void addToItems(final ClaimItem item) {
+        items.add(item);
+    }
+
+    // }}
+
+    // {{ action: Submit
+    public void submit(final Approver approver) {
+        setStatus("Submitted");
+        setApprover(approver);
+    }
+
+    public String disableSubmit() {
+        return getStatus().equals("New") ? null : "Claim has already been submitted";
+    }
+
+    public Object[] defaultSubmit() {
+        return new Object[] { getClaimant().getApprover() };
+    }
+    // }}
+
+}

Added: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimItem.java?rev=1226153&view=auto
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimItem.java (added)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimItem.java Sat Dec 31 18:10:52 2011
@@ -0,0 +1,77 @@
+/*
+ *  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.progmodel.wrapper.dom.claim;
+
+import org.apache.isis.applib.AbstractDomainObject;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.value.Date;
+import org.apache.isis.applib.value.Money;
+
+public class ClaimItem extends AbstractDomainObject {
+
+    // {{ Title
+    public String title() {
+        return getDescription();
+    }
+
+    // }}
+
+    // {{ DateIncurred
+    private Date dateIncurred;
+
+    @MemberOrder(sequence = "1")
+    public Date getDateIncurred() {
+        return dateIncurred;
+    }
+
+    public void setDateIncurred(final Date dateIncurred) {
+        this.dateIncurred = dateIncurred;
+    }
+
+    // }}
+
+    // {{ Description
+    private String description;
+
+    @MemberOrder(sequence = "2")
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(final String description) {
+        this.description = description;
+    }
+
+    // }}
+
+    // {{ Amount
+    private Money amount;
+
+    @MemberOrder(sequence = "3")
+    public Money getAmount() {
+        return amount;
+    }
+
+    public void setAmount(final Money price) {
+        this.amount = price;
+    }
+    // }}
+
+}

Added: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepository.java?rev=1226153&view=auto
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepository.java (added)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepository.java Sat Dec 31 18:10:52 2011
@@ -0,0 +1,36 @@
+/*
+ *  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.progmodel.wrapper.dom.claim;
+
+import java.util.List;
+
+import org.apache.isis.applib.annotation.Named;
+
+@Named("Claims")
+public interface ClaimRepository {
+
+    public List<Claim> allClaims();
+
+    public List<Claim> findClaims(@Named("Description") String description);
+
+    public List<Claim> claimsFor(Claimant claimant);
+
+    public Claim newClaim(Claimant claimant);
+}

Added: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepositoryImpl.java?rev=1226153&view=auto
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepositoryImpl.java (added)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/ClaimRepositoryImpl.java Sat Dec 31 18:10:52 2011
@@ -0,0 +1,46 @@
+/*
+ *  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.progmodel.wrapper.dom.claim;
+
+import java.util.List;
+
+public class ClaimRepositoryImpl implements ClaimRepository {
+
+    @Override
+    public List<Claim> allClaims() {
+        return null;
+    }
+
+    @Override
+    public List<Claim> findClaims(final String description) {
+        return null;
+    }
+
+    @Override
+    public List<Claim> claimsFor(final Claimant claimant) {
+        return null;
+    }
+
+    @Override
+    public Claim newClaim(final Claimant claimant) {
+        return null;
+    }
+
+}

Added: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claimant.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claimant.java?rev=1226153&view=auto
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claimant.java (added)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/claim/Claimant.java Sat Dec 31 18:10:52 2011
@@ -0,0 +1,26 @@
+/*
+ *  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.progmodel.wrapper.dom.claim;
+
+public interface Claimant {
+
+    Approver getApprover();
+
+}

Added: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/Employee.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/Employee.java?rev=1226153&view=auto
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/Employee.java (added)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/Employee.java Sat Dec 31 18:10:52 2011
@@ -0,0 +1,119 @@
+/*
+ *  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.progmodel.wrapper.dom.employee;
+
+import org.apache.isis.applib.AbstractDomainObject;
+import org.apache.isis.applib.annotation.Disabled;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.When;
+import org.apache.isis.progmodel.wrapper.dom.claim.Approver;
+import org.apache.isis.progmodel.wrapper.dom.claim.Claimant;
+
+public class Employee extends AbstractDomainObject implements Claimant, Approver {
+
+    // {{ Title
+    public String title() {
+        return getName();
+    }
+
+    // }}
+
+    // {{ Name
+    private String name;
+
+    @MemberOrder(sequence = "1")
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public void modifyName(final String name) {
+        setName(name);
+    }
+
+    public void clearName() {
+        setName(null);
+    }
+
+    public boolean whetherHideName;
+
+    public boolean hideName() {
+        return whetherHideName;
+    }
+
+    public String reasonDisableName;
+
+    public String disableName() {
+        return reasonDisableName;
+    }
+
+    public String reasonValidateName;
+
+    public String validateName(final String name) {
+        return reasonValidateName;
+    }
+
+    // }}
+
+    // {{ Password
+    private String password;
+
+    @MemberOrder(sequence = "2")
+    @Disabled(When.ONCE_PERSISTED)
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(final String password) {
+        this.password = password;
+    }
+
+    // }}
+
+    // {{ Approver
+    private Approver approver;
+
+    @Override
+    @MemberOrder(sequence = "2")
+    public Approver getApprover() {
+        return approver;
+    }
+
+    public void setApprover(final Approver approver) {
+        this.approver = approver;
+    }
+    // }}
+
+    
+    // {{ injected: EmployeeRepository
+    private EmployeeRepository employeeRepository;
+    public EmployeeRepository getEmployeeRepository() {
+        return employeeRepository;
+    }
+    public void setEmployeeRepository(final EmployeeRepository employeeRepository) {
+        this.employeeRepository = employeeRepository;
+    }
+    // }}
+
+
+}

Added: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepository.java?rev=1226153&view=auto
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepository.java (added)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepository.java Sat Dec 31 18:10:52 2011
@@ -0,0 +1,32 @@
+/*
+ *  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.progmodel.wrapper.dom.employee;
+
+import java.util.List;
+
+import org.apache.isis.applib.annotation.Named;
+
+@Named("Employees")
+public interface EmployeeRepository {
+
+    public List<Employee> allEmployees();
+
+    public List<Employee> findEmployees(@Named("Name") String name);
+}

Added: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepositoryImpl.java?rev=1226153&view=auto
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepositoryImpl.java (added)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/EmployeeRepositoryImpl.java Sat Dec 31 18:10:52 2011
@@ -0,0 +1,35 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.progmodel.wrapper.dom.employee;
+
+import java.util.List;
+
+public class EmployeeRepositoryImpl implements EmployeeRepository {
+
+    @Override
+    public List<Employee> allEmployees() {
+        return null;
+    }
+
+    @Override
+    public List<Employee> findEmployees(final String name) {
+        return null;
+    }
+}

Modified: incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/classsubstitutor/CglibClassSubstitutor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/classsubstitutor/CglibClassSubstitutor.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/classsubstitutor/CglibClassSubstitutor.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/classsubstitutor/CglibClassSubstitutor.java Sat Dec 31 18:10:52 2011
@@ -20,8 +20,8 @@
 package org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor;
 
 import org.apache.isis.core.commons.lang.JavaClassUtils;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.CglibEnhanced;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
-import org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.internal.CglibEnhanced;
 
 public class CglibClassSubstitutor extends ClassSubstitutorAbstract {
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Sat Dec 31 18:10:52 2011
@@ -33,6 +33,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils.ImperativeFacetFlags;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.CglibEnhanced;
 import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
 import org.apache.isis.runtimes.dflt.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectChanger;

Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/pom.xml?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/pom.xml Sat Dec 31 18:10:52 2011
@@ -73,12 +73,22 @@
 			<groupId>org.mortbay.jetty</groupId>
 			<artifactId>jetty</artifactId>
 		</dependency>
+		<dependency>
+	        <groupId>org.mortbay.jetty</groupId>
+	        <artifactId>jsp-2.1</artifactId>
+	    </dependency>
+	    <dependency>
+	        <groupId>org.mortbay.jetty</groupId>
+	        <artifactId>jsp-api-2.1</artifactId>
+	    </dependency>
 
 	    <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+
+    
 	</dependencies>
 
 </project>

Modified: incubator/isis/trunk/framework/runtimes/embedded/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/pom.xml?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/pom.xml Sat Dec 31 18:10:52 2011
@@ -88,11 +88,6 @@
                 <artifactId>dflt</artifactId>
                 <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
-                <artifactId>identity</artifactId>
-                <version>0.2.0-incubating-SNAPSHOT</version>
-            </dependency>
 
 			<dependency>
 				<groupId>org.apache.isis.progmodels</groupId>
@@ -108,20 +103,17 @@
 			<artifactId>metamodel</artifactId>
         </dependency>
 
+<!--
 		<dependency>
 			<groupId>org.apache.isis.progmodels</groupId>
 			<artifactId>wrapper-metamodel</artifactId>
         </dependency>
+-->
 
         <dependency>
             <groupId>org.apache.isis.progmodels</groupId>
             <artifactId>dflt</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
-            <artifactId>identity</artifactId>
-        </dependency>
         
         <dependency>
             <groupId>org.apache.isis.core</groupId>

Modified: incubator/isis/trunk/framework/runtimes/embedded/src/docbkx/guide/isis-embedded-runtime.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/docbkx/guide/isis-embedded-runtime.xml?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/docbkx/guide/isis-embedded-runtime.xml (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/docbkx/guide/isis-embedded-runtime.xml Sat Dec 31 18:10:52 2011
@@ -99,6 +99,17 @@
     <sect1>
       <title>Introduction</title>
 
+      <para></para>
+
+      <para>*** TODO: remove WrapperFactory stuff, since have removed the
+      dependency on that module.</para>
+
+      <para></para>
+
+      <para></para>
+
+      <para></para>
+
       <para>The heart of the <emphasis>embedded runtime</emphasis> is the
       <classname>IsisMetaModel</classname> class. This combines all the
       various internal components (all pluggable) that specify, identify and
@@ -445,16 +456,12 @@
             </row>
 
             <row>
-              <entry>DomainObjectContainer &amp; WrapperFactory</entry>
+              <entry>DomainObjectContainer</entry>
 
               <entry>Implementation of the
               <classname>org.apache.isis.applib.DomainObjectContainer</classname>
               interface (which provides as single facade to the runtime for a
-              domain object). the implementation also implements
-              <classname>org.apache.isis.progmodel.wrapper.applib.WrapperFactory</classname>
-              interface. This allows domain objects to interact directly but
-              still enforcing the business logic of the programming
-              model.</entry>
+              domain object).</entry>
             </row>
 
             <row>
@@ -541,20 +548,10 @@
     </sect1>
 
     <sect1>
-      <title>Using WrapperFactory within a Domain Object</title>
+      <title>Using IsisMetaModel to validate interactions</title>
 
-      <para>The IsisMetaModel creates a
-      DomainObjectContainerWrapperFactory.</para>
-
-      <para></para>
-
-      <para></para>
-
-      <para>The Wrapped Objects</para>
-
-      <para>- how they handle save(), how they hand title()</para>
-
-      <para></para>
+      <para>*** TODO: define a simple interface to make this easy to
+      do.</para>
 
       <para></para>
 

Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java Sat Dec 31 18:10:52 2011
@@ -24,40 +24,31 @@ import java.util.List;
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.runtimes.embedded.internal.PersistenceState;
 
 public interface EmbeddedContext {
 
     AuthenticationSession getAuthenticationSession();
-
     Localization getLocalization();
 
     Object instantiate(Class<?> type);
     
     void resolve(Object parent);
-
     void resolve(Object parent, Object field);
 
-    void objectChanged(Object object);
-
     void makePersistent(Object object);
-
+    void objectChanged(Object object);
     void remove(Object object);
 
     PersistenceState getPersistenceState(Object object);
 
     <T> List<T> allMatchingQuery(Query<T> query);
-
     <T> T firstMatchingQuery(Query<T> query);
 
     boolean flush();
-
     void commit();
 
     void informUser(String message);
-
     void warnUser(String message);
-
     void raiseError(String message);
 
 

Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java Sat Dec 31 18:10:52 2011
@@ -24,7 +24,6 @@ import java.util.List;
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.runtimes.embedded.internal.PersistenceState;
 
 public class EmbeddedContextNoop implements EmbeddedContext {
 



Mime
View raw message