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 2010/11/08 13:59:33 UTC
svn commit: r1032561 [5/19] - in /incubator/isis/trunk:
alternatives/bytecode/identity/src/main/java/org/apache/isis/metamodel/specloader/classsubstitutor/
alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/
...
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetsForMethodFilter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetsForMethodFilter.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetsForMethodFilter.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetsForMethodFilter.java Mon Nov 8 12:58:33 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.metamodel.java5;
+package org.apache.isis.core.metamodel.java5;
import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.core.commons.filters.AbstractFilter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Finds the {@link ImperativeFacet}(s) that correspond to the provided method.
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/MethodPrefixBasedFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/MethodPrefixBasedFacetFactory.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/MethodPrefixBasedFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/MethodPrefixBasedFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.metamodel.java5;
+package org.apache.isis.core.metamodel.java5;
import java.util.List;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.specloader.internal.facetprocessor.FacetProcessor;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.specloader.internal.facetprocessor.FacetProcessor;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveGetClassMethodFacetFactory.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveGetClassMethodFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveGetClassMethodFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveGetClassMethodFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveGetClassMethodFacetFactory.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveGetClassMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveGetClassMethodFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.metamodel.java5;
+package org.apache.isis.core.metamodel.java5;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.MethodScope;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.facets.MethodScope;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveInitMethodFacetFactory.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveInitMethodFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveInitMethodFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveInitMethodFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveInitMethodFacetFactory.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveInitMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveInitMethodFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.metamodel.java5;
+package org.apache.isis.core.metamodel.java5;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.MethodScope;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.facets.MethodScope;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.metamodel.java5;
+package org.apache.isis.core.metamodel.java5;
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.MethodScope;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.facets.MethodScope;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.metamodel.java5;
+package org.apache.isis.core.metamodel.java5;
import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.MethodScope;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.facets.MethodScope;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.metamodel.java5;
+package org.apache.isis.core.metamodel.java5;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.MethodScope;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.facets.MethodScope;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.metamodel.java5;
+package org.apache.isis.core.metamodel.java5;
import java.lang.reflect.Method;
import org.apache.isis.core.commons.lang.JavaClassUtils;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectInstantiationException.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/ObjectInstantiationException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectInstantiationException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectInstantiationException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/ObjectInstantiationException.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/ObjectInstantiationException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectInstantiationException.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.runtimecontext;
public class ObjectInstantiationException extends Exception {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContext.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContext.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.runtimecontext;
import java.util.List;
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
* Decouples the metamodel from a runtime.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContextAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContextAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContextAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,17 +18,17 @@
*/
-package org.apache.isis.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.runtimecontext;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.metamodel.services.container.DomainObjectContainerAware;
-import org.apache.isis.metamodel.specloader.ObjectReflectorAbstract;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.services.container.DomainObjectContainerAware;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
public abstract class RuntimeContextAbstract implements RuntimeContext, SpecificationLoaderAware, DomainObjectContainerAware {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContextAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContextAware.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContextAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.runtimecontext;
public interface RuntimeContextAware {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.runtimecontext.noruntime;
+package org.apache.isis.core.metamodel.runtimecontext.noruntime;
import java.io.IOException;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.runtimecontext.noruntime;
+package org.apache.isis.core.metamodel.runtimecontext.noruntime;
import java.util.ArrayList;
import java.util.List;
@@ -27,10 +27,10 @@ import org.apache.isis.applib.query.Quer
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.runtimecontext.ObjectInstantiationException;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAbstract;
public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.runtimecontext.spec;
+package org.apache.isis.core.metamodel.runtimecontext.spec;
import java.util.ArrayList;
import java.util.Arrays;
@@ -33,6 +33,22 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
+import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectActionSet;
import org.apache.isis.core.metamodel.spec.IntrospectableSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Persistability;
@@ -43,22 +59,6 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.hide.HiddenFacet;
-import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacet;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.metamodel.interactions.InteractionContext;
-import org.apache.isis.metamodel.interactions.InteractionUtils;
-import org.apache.isis.metamodel.interactions.ObjectTitleContext;
-import org.apache.isis.metamodel.interactions.ObjectValidityContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectActionSet;
// TODO work through all subclasses and remove duplicated overridden methods - this
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.runtimecontext.spec;
+package org.apache.isis.core.metamodel.runtimecontext.spec;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.debug.DebugString;
@@ -28,14 +28,14 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.Veto;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorSet;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Persistability;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.util.NameUtils;
-import org.apache.isis.metamodel.interactions.InteractionContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectActionSet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectActionSet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectActionSet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectActionSet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectActionSet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectActionSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectActionSet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.runtimecontext.spec.feature;
+package org.apache.isis.core.metamodel.runtimecontext.spec.feature;
import java.util.List;
@@ -31,17 +31,17 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.consent.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.MultiTypedFacet;
+import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Target;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.MultiTypedFacet;
-import org.apache.isis.metamodel.interactions.ActionInvocationContext;
-import org.apache.isis.metamodel.interactions.UsabilityContext;
-import org.apache.isis.metamodel.interactions.VisibilityContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
public class ObjectActionSet implements ObjectAction {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,17 +18,17 @@
*/
-package org.apache.isis.metamodel.runtimecontext.spec.feature;
+package org.apache.isis.core.metamodel.runtimecontext.spec.feature;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
+import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
+import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
-import org.apache.isis.metamodel.facets.properties.choices.PropertyChoicesFacet;
-import org.apache.isis.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
// TODO need to pull up the common methods. like getName(), from subclasses
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.runtimecontext.spec.feature;
+package org.apache.isis.core.metamodel.runtimecontext.spec.feature;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.filters.Filter;
@@ -27,21 +27,21 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.MultiTypedFacet;
+import org.apache.isis.core.metamodel.facets.help.HelpFacet;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.identifier.Identified;
import org.apache.isis.core.metamodel.util.NameUtils;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.MultiTypedFacet;
-import org.apache.isis.metamodel.facets.help.HelpFacet;
-import org.apache.isis.metamodel.facets.hide.HiddenFacet;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
-import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
-import org.apache.isis.metamodel.interactions.InteractionUtils;
-import org.apache.isis.metamodel.interactions.UsabilityContext;
-import org.apache.isis.metamodel.interactions.VisibilityContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
public abstract class ObjectMemberAbstract implements ObjectMember {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjector.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjector.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services;
+package org.apache.isis.core.metamodel.services;
import java.util.List;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAbstract.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services;
+package org.apache.isis.core.metamodel.services;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAware.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAware.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAware.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services;
+package org.apache.isis.core.metamodel.services;
public interface ServicesInjectorAware {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorDefault.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services;
+package org.apache.isis.core.metamodel.services;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerAware.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services.container;
+package org.apache.isis.core.metamodel.services.container;
import org.apache.isis.applib.DomainObjectContainer;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerDefault.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services.container;
+package org.apache.isis.core.metamodel.services.container;
import java.util.ArrayList;
import java.util.List;
@@ -34,13 +34,13 @@ import org.apache.isis.core.commons.ensu
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindAllInstances;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindByPattern;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindByTitle;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.util.IsisUtils;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
-import org.apache.isis.metamodel.services.container.query.QueryFindByPattern;
-import org.apache.isis.metamodel.services.container.query.QueryFindByTitle;
public class DomainObjectContainerDefault implements DomainObjectContainer, RuntimeContextAware {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryBuiltInAbstract.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryBuiltInAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryBuiltInAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryBuiltInAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryBuiltInAbstract.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryBuiltInAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryBuiltInAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.metamodel.services.container.query;
+package org.apache.isis.core.metamodel.services.container.query;
import java.io.Serializable;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
/**
* Although (through this class) the subclasses implements {@link Query} and
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryCardinality.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryCardinality.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryCardinality.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryCardinality.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services.container.query;
+package org.apache.isis.core.metamodel.services.container.query;
public enum QueryCardinality {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindAllInstances.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryFindAllInstances.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindAllInstances.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindAllInstances.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryFindAllInstances.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryFindAllInstances.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindAllInstances.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services.container.query;
+package org.apache.isis.core.metamodel.services.container.query;
import java.io.Serializable;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services.container.query;
+package org.apache.isis.core.metamodel.services.container.query;
import java.io.Serializable;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.services.container.query;
+package org.apache.isis.core.metamodel.services.container.query;
import java.io.Serializable;
import java.text.MessageFormat;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribedFacetHolder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribedFacetHolder.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribedFacetHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribedFacetHolder.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.spec;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public interface NamedAndDescribedFacetHolder extends NamedAndDescribed, FacetHolder {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java Mon Nov 8 12:58:33 2010
@@ -26,19 +26,19 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
+import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationContainer;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.hide.HiddenFacet;
-import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.metamodel.interactions.InteractionContext;
-import org.apache.isis.metamodel.interactions.ObjectTitleContext;
-import org.apache.isis.metamodel.interactions.ObjectValidityContext;
public interface ObjectSpecification extends Specification, ObjectActionContainer, ObjectAssociationContainer, Hierarchical, Dirtiable, DefaultProvider {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationFacets.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationFacets.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationFacets.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationFacets.java Mon Nov 8 12:58:33 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.spec;
-import org.apache.isis.metamodel.facets.When;
-import org.apache.isis.metamodel.facets.object.bounded.BoundedFacet;
-import org.apache.isis.metamodel.facets.object.cached.CachedFacet;
-import org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
+import org.apache.isis.core.metamodel.facets.object.cached.CachedFacet;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
public class SpecificationFacets {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java Mon Nov 8 12:58:33 2010
@@ -25,10 +25,10 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.interactions.AccessContext;
+import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Target;
-import org.apache.isis.metamodel.interactions.AccessContext;
-import org.apache.isis.metamodel.interactions.ActionInvocationContext;
public interface ObjectAction extends ObjectMember {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java Mon Nov 8 12:58:33 2010
@@ -23,8 +23,8 @@ package org.apache.isis.core.metamodel.s
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.interactions.ActionArgumentContext;
import org.apache.isis.core.metamodel.spec.NamedAndDescribed;
-import org.apache.isis.metamodel.interactions.ActionArgumentContext;
/**
* Analogous to {@link ObjectAssociation}.
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionType.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionType.java Mon Nov 8 12:58:33 2010
@@ -20,11 +20,11 @@
package org.apache.isis.core.metamodel.spec.feature;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.actions.debug.DebugFacet;
-import org.apache.isis.metamodel.facets.actions.exploration.ExplorationFacet;
-import org.apache.isis.metamodel.facets.actions.prototype.PrototypeFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
+import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
public enum ObjectActionType {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java Mon Nov 8 12:58:33 2010
@@ -25,10 +25,10 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.interactions.AccessContext;
-import org.apache.isis.metamodel.interactions.InteractionContext;
-import org.apache.isis.metamodel.interactions.UsabilityContext;
-import org.apache.isis.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.interactions.AccessContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
/**
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java Mon Nov 8 12:58:33 2010
@@ -24,9 +24,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.interactions.AccessContext;
-import org.apache.isis.metamodel.interactions.InteractionContext;
-import org.apache.isis.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.interactions.AccessContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
public interface OneToManyAssociation extends ObjectAssociation, OneToManyFeature {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java Mon Nov 8 12:58:33 2010
@@ -24,10 +24,10 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.interactions.AccessContext;
-import org.apache.isis.metamodel.interactions.InteractionContext;
-import org.apache.isis.metamodel.interactions.PropertyAccessContext;
-import org.apache.isis.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.interactions.AccessContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
/**
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/Identified.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/Identified.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/Identified.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/Identified.java Mon Nov 8 12:58:33 2010
@@ -21,7 +21,7 @@
package org.apache.isis.core.metamodel.spec.identifier;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public interface Identified extends FacetHolder {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/IdentifiedImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/IdentifiedImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/IdentifiedImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/IdentifiedImpl.java Mon Nov 8 12:58:33 2010
@@ -21,7 +21,7 @@
package org.apache.isis.core.metamodel.spec.identifier;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
public class IdentifiedImpl extends FacetHolderImpl implements Identified {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/FacetDecoratorInstaller.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/FacetDecoratorInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/FacetDecoratorInstaller.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/FacetDecoratorInstaller.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/FacetDecoratorInstaller.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/FacetDecoratorInstaller.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/FacetDecoratorInstaller.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.core.metamodel.specloader;
import java.util.List;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflector.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflector.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflector.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflector.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflector.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflector.java Mon Nov 8 12:58:33 2010
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.core.metamodel.specloader;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
public interface ObjectReflector extends SpecificationLoader,
ApplicationScopedComponent, RuntimeContextAware {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorAbstract.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.core.metamodel.specloader;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
import static org.hamcrest.CoreMatchers.is;
@@ -40,22 +40,22 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorSet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
+import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.spec.IntrospectableSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationFacets;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
-import org.apache.isis.metamodel.specloader.internal.cache.SimpleSpecificationCache;
-import org.apache.isis.metamodel.specloader.internal.cache.SpecificationCache;
-import org.apache.isis.metamodel.specloader.internal.facetprocessor.FacetProcessor;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
+import org.apache.isis.core.metamodel.specloader.internal.cache.SimpleSpecificationCache;
+import org.apache.isis.core.metamodel.specloader.internal.cache.SpecificationCache;
+import org.apache.isis.core.metamodel.specloader.internal.facetprocessor.FacetProcessor;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.log4j.Logger;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorInstaller.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorInstaller.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorInstaller.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorInstaller.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorInstaller.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorInstaller.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.core.metamodel.specloader;
import org.apache.isis.core.commons.components.Installer;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectiveActionException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectiveActionException.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectiveActionException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.core.metamodel.specloader;
import org.apache.isis.core.commons.exceptions.IsisException;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java Mon Nov 8 12:58:33 2010
@@ -18,18 +18,18 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.core.metamodel.specloader;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverserDefault;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorNoop;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
+import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorNoop;
public final class ReflectorConstants {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoader.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoader.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoader.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.core.metamodel.specloader;
import java.util.List;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderAware.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderAware.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderAware.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.core.metamodel.specloader;
public interface SpecificationLoaderAware {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader.classsubstitutor;
+package org.apache.isis.core.metamodel.specloader.classsubstitutor;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.Injectable;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader.classsubstitutor;
+package org.apache.isis.core.metamodel.specloader.classsubstitutor;
import java.util.Collections;
import java.util.HashSet;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAware.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAware.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader.classsubstitutor;
+package org.apache.isis.core.metamodel.specloader.classsubstitutor;
public interface ClassSubstitutorAware {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java Mon Nov 8 12:58:33 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.metamodel.specloader.classsubstitutor;
+package org.apache.isis.core.metamodel.specloader.classsubstitutor;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutorAware;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAware;
import com.google.common.collect.Lists;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader.collectiontyperegistry;
+package org.apache.isis.core.metamodel.specloader.collectiontyperegistry;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.Injectable;