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 [3/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/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java Mon Nov 8 12:58:33 2010
@@ -29,7 +29,7 @@ import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.DummyNullValue;
import org.apache.isis.remoting.data.DummyReferenceData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java Mon Nov 8 12:58:33 2010
@@ -27,8 +27,8 @@ import java.util.Vector;
import org.apache.commons.collections.CollectionUtils;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacetAbstract;
import org.apache.isis.remoting.data.DummyCollectionData;
import org.apache.isis.remoting.data.DummyObjectData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java Mon Nov 8 12:58:33 2010
@@ -25,9 +25,9 @@ import static org.junit.Assert.assertTru
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.DummyEncodeableObjectData;
import org.apache.isis.remoting.data.DummyNullValue;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java Mon Nov 8 12:58:33 2010
@@ -26,11 +26,11 @@ import static org.junit.Assert.fail;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.remoting.data.DummyEncodeableObjectData;
import org.apache.isis.remoting.data.DummyReferenceData;
import org.apache.isis.remoting.data.common.ObjectData;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java Mon Nov 8 12:58:33 2010
@@ -20,16 +20,16 @@
package org.apache.isis.core.metamodel.adapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.LoadedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.LoadingCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.LoadedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
public class LifeCycleEvent {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.adapter;
+import org.apache.isis.core.metamodel.interactions.ProposedHolder;
import org.apache.isis.core.metamodel.spec.Specification;
-import org.apache.isis.metamodel.interactions.ProposedHolder;
/**
* Mix-in for {@link Instance} implementations, where can hold a
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectMetaModel.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectMetaModel.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectMetaModel.java Mon Nov 8 12:58:33 2010
@@ -19,9 +19,9 @@
package org.apache.isis.core.metamodel.adapter;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Specification;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
/**
* Adapters to domain objects, where the application is written in terms of domain objects and those objects are
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.consent;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.consent;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisorFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisorFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisorFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisorFacet.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.consent;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
/**
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.consent;
-import org.apache.isis.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
/**
* Powertype for the {@link InteractionContext} hierarchy.
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.consent;
-import org.apache.isis.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
/**
* Whether an {@link InteractionContext} was invoked by the user, or is programmatic.
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java Mon Nov 8 12:58:33 2010
@@ -23,7 +23,7 @@ package org.apache.isis.core.metamodel.c
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
import static org.apache.isis.core.commons.matchers.NofMatchers.nonEmptyString;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
public class Veto extends ConsentAbstract {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facetdecorator;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public interface FacetDecorator {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facetdecorator;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public abstract class FacetDecoratorAbstract implements FacetDecorator {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java Mon Nov 8 12:58:33 2010
@@ -32,9 +32,9 @@ import java.util.Set;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.metamodel.exceptions.ReflectionException;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
public class FacetDecoratorSet implements ApplicationScopedComponent {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DecoratingFacet.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DecoratingFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DecoratingFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DecoratingFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DecoratingFacet.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DecoratingFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DecoratingFacet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
/**
* Provides access to underlying facet that has been decorated.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Enumeration.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Enumeration.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Enumeration.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Enumeration.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Enumeration.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Enumeration.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Enumeration.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public interface Enumeration {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/EnumerationAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/EnumerationAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/EnumerationAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/EnumerationAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/EnumerationAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/EnumerationAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/EnumerationAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public abstract class EnumerationAbstract implements Enumeration {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Facet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Facet.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Facet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public interface Facet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetAbstract.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -28,10 +28,10 @@ import static org.apache.isis.core.commo
import org.apache.isis.core.commons.ensure.Ensure;
import org.apache.isis.core.commons.matchers.NofMatchers;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
-import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
public abstract class FacetAbstract implements Facet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Method;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactoryAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactoryAbstract.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
public abstract class FacetFactoryAbstract implements FacetFactory, SpecificationLoaderAware {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFilters.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFilters.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFilters.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFilters.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFilters.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFilters.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFilters.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import org.apache.isis.core.commons.filters.AbstractFilter;
import org.apache.isis.core.commons.filters.Filter;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolder.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetHolder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolder.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolder.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetHolder.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolder.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import org.apache.isis.core.commons.filters.Filter;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetHolderImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetHolderImpl.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetHolderImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import java.util.HashMap;
import java.util.Map;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetUtil.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetUtil.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetUtil.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import java.util.ArrayList;
import java.util.Hashtable;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/InterfaceBasedFacetFactory.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/InterfaceBasedFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/InterfaceBasedFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/InterfaceBasedFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/InterfaceBasedFacetFactory.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/InterfaceBasedFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/InterfaceBasedFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
/**
* Marker interface to indicate that the {@link FacetFactory} works by checking whether the object implements
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacet.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MarkerFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MarkerFacet.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MarkerFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public interface MarkerFacet extends Facet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacetAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MarkerFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MarkerFacetAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MarkerFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public abstract class MarkerFacetAbstract extends FacetAbstract implements MarkerFacet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFilteringFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFilteringFacetFactory.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFilteringFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Method;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodRemover.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodRemover.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodRemover.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Method;
import java.util.List;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodRemoverConstants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodRemoverConstants.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodRemoverConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Method;
import java.util.ArrayList;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodScope.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodScope.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodScope.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodScope.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodScope.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodScope.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodScope.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
/**
* As used in the <tt>findAndRemove...</tt> methods.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacet.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultiTypedFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultiTypedFacet.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultiTypedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
/**
* A Class that provides multiple facet implementations, either directly or through a delegate.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacetAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultiTypedFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultiTypedFacetAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultiTypedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacet.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultipleValueFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultipleValueFacet.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultipleValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public interface MultipleValueFacet extends Facet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacetAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultipleValueFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultipleValueFacetAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultipleValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public abstract class MultipleValueFacetAbstract extends FacetAbstract implements MultipleValueFacet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/NamedAndDescribedFacetHolderImpl.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/NamedAndDescribedFacetHolderImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/NamedAndDescribedFacetHolderImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/NamedAndDescribedFacetHolderImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/NamedAndDescribedFacetHolderImpl.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/NamedAndDescribedFacetHolderImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/NamedAndDescribedFacetHolderImpl.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import org.apache.isis.core.metamodel.spec.NamedAndDescribedFacetHolder;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Method;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleClassValueFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleClassValueFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleClassValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleClassValueFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleClassValueFacetAbstract.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleClassValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,10 +18,10 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public abstract class SingleClassValueFacetAbstract extends FacetAbstract implements SingleClassValueFacet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacet.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleIntValueFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleIntValueFacet.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleIntValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public interface SingleIntValueFacet extends Facet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacetAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleIntValueFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleIntValueFacetAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleIntValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public abstract class SingleIntValueFacetAbstract extends FacetAbstract implements SingleIntValueFacet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacet.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleStringValueFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleStringValueFacet.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleStringValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public interface SingleStringValueFacet extends Facet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacetAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleStringValueFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleStringValueFacetAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleStringValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacet.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleValueFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleValueFacet.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public interface SingleValueFacet extends Facet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacetAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleValueFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleValueFacetAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public abstract class SingleValueFacetAbstract extends FacetAbstract implements SingleValueFacet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacet.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleWhenValueFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleWhenValueFacet.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleWhenValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacet.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public interface SingleWhenValueFacet extends Facet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacetAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleWhenValueFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleWhenValueFacetAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleWhenValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
public abstract class SingleWhenValueFacetAbstract extends FacetAbstract implements SingleWhenValueFacet {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/When.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/When.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/When.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java Mon Nov 8 12:58:33 2010
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actcoll.typeof;
+package org.apache.isis.core.metamodel.facets.actcoll.typeof;
-import org.apache.isis.metamodel.facets.SingleClassValueFacet;
+import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
* The type of the collection or the action.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacet.java Mon Nov 8 12:58:33 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.metamodel.facets.actions.choices;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Obtain choices for each of the parameters of the action.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java Mon Nov 8 12:58:33 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.metamodel.facets.actions.choices;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Obtain choices for each of the parameters of the action.
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java Mon Nov 8 12:58:33 2010
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.debug;
+package org.apache.isis.core.metamodel.facets.actions.debug;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Indicates that the action should only be available in a special <i>debug</i> mode.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacet.java Mon Nov 8 12:58:33 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.metamodel.facets.actions.defaults;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Obtain defaults for each of the parameters of the action.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java Mon Nov 8 12:58:33 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.metamodel.facets.actions.defaults;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Obtain defaults for each of the parameters of the action.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacet.java Mon Nov 8 12:58:33 2010
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.executed;
+package org.apache.isis.core.metamodel.facets.actions.executed;
+import org.apache.isis.core.metamodel.facets.EnumerationAbstract;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.Target;
-import org.apache.isis.metamodel.facets.EnumerationAbstract;
-import org.apache.isis.metamodel.facets.Facet;
/**
* Whether the action should be invoked locally, remotely, or on the default location depending on its persistence
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java Mon Nov 8 12:58:33 2010
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.exploration;
+package org.apache.isis.core.metamodel.facets.actions.exploration;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Indicates that the action should only be available in a special <i>exploration</i> mode.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/invoke/ActionInvocationFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/invoke/ActionInvocationFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/invoke/ActionInvocationFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/invoke/ActionInvocationFacet.java Mon Nov 8 12:58:33 2010
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.invoke;
+package org.apache.isis.core.metamodel.facets.actions.invoke;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
/**
* Represents the mechanism by which the action should be invoked.
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacet.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacet.java Mon Nov 8 12:58:33 2010
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.prototype;
+package org.apache.isis.core.metamodel.facets.actions.prototype;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Indicates that the action should only be available in a special <i>prototype</i> mode.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacet.java Mon Nov 8 12:58:33 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.collections.modify;
+package org.apache.isis.core.metamodel.facets.collections.modify;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Add object to a collection.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionClearFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionClearFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionClearFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionClearFacet.java Mon Nov 8 12:58:33 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.collections.modify;
+package org.apache.isis.core.metamodel.facets.collections.modify;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Clear all objects from a collection.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java Mon Nov 8 12:58:33 2010
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.metamodel.facets.collections.modify;
+package org.apache.isis.core.metamodel.facets.collections.modify;
import java.util.Collection;
import java.util.Enumeration;
import java.util.Iterator;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java Mon Nov 8 12:58:33 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.collections.modify;
+package org.apache.isis.core.metamodel.facets.collections.modify;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Remove object to a collection.
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacet.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacet.java Mon Nov 8 12:58:33 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.metamodel.facets.help;
+package org.apache.isis.core.metamodel.facets.help;
-import org.apache.isis.metamodel.facets.SingleStringValueFacet;
+import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
/**
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/hide/HiddenFacet.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/hide/HiddenFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/hide/HiddenFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/hide/HiddenFacet.java Mon Nov 8 12:58:33 2010
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.hide;
+package org.apache.isis.core.metamodel.facets.hide;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.SingleWhenValueFacet;
-import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.SingleWhenValueFacet;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
/**
* Hide a property, collection or action.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/NamedAndDescribedNameComparator.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/NamedAndDescribedNameComparator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/NamedAndDescribedNameComparator.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/NamedAndDescribedNameComparator.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/NamedAndDescribedNameComparator.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/NamedAndDescribedNameComparator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/NamedAndDescribedNameComparator.java Mon Nov 8 12:58:33 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.facets.naming;
+package org.apache.isis.core.metamodel.facets.naming;
import java.io.Serializable;
import java.util.Comparator;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacet.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacet.java Mon Nov 8 12:58:33 2010
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.naming.describedas;
+package org.apache.isis.core.metamodel.facets.naming.describedas;
-import org.apache.isis.metamodel.facets.SingleStringValueFacet;
+import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
/**
* Describes a class, a property, collection, an action or an action parameter.
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacet.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacet.java Mon Nov 8 12:58:33 2010
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.metamodel.facets.naming.named;
+package org.apache.isis.core.metamodel.facets.naming.named;
-import org.apache.isis.metamodel.facets.SingleStringValueFacet;
+import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
/**
* The name of a class, a property, collection, an action or a parameter.