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 20:38:12 UTC

svn commit: r1032676 [2/13] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmode...

Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Mon Nov  8 19:37:44 2010
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.ja
 import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils.ImperativeFacetFlags;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.spec.JavaSpecification;
+import org.apache.isis.core.progmodel.spec.JavaSpecification;
 import org.apache.isis.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
 import org.apache.isis.runtime.persistence.objectfactory.ObjectChanger;
 import org.apache.isis.runtime.persistence.objectfactory.ObjectResolver;

Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java Mon Nov  8 19:37:44 2010
@@ -45,7 +45,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.metamodel.util.IsisUtils;
-import org.apache.isis.metamodel.spec.JavaSpecification;
+import org.apache.isis.core.progmodel.spec.JavaSpecification;
 import org.apache.isis.progmodel.wrapper.applib.DisabledException;
 import org.apache.isis.progmodel.wrapper.applib.HiddenException;
 import org.apache.isis.progmodel.wrapper.applib.InteractionException;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java Mon Nov  8 19:37:44 2010
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.sp
 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.actions.invoke.ActionInvocationFacetAbstract;
+import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetAbstract;
 import org.apache.isis.remoting.data.Data;
 import org.apache.isis.remoting.data.common.NullData;
 import org.apache.isis.remoting.data.common.ObjectData;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java Mon Nov  8 19:37:44 2010
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.facets.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacetAbstract;
+import org.apache.isis.core.progmodel.facets.collections.modify.CollectionAddToFacetAbstract;
 import org.apache.isis.remoting.data.common.IdentityData;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.exchange.SetAssociationRequest;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java Mon Nov  8 19:37:44 2010
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.facets.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;
+import org.apache.isis.core.progmodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;
 import org.apache.isis.remoting.data.common.IdentityData;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.exchange.ClearAssociationRequest;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java Mon Nov  8 19:37:44 2010
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.facets.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacetAbstract;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertyClearFacetAbstract;
 import org.apache.isis.remoting.data.common.IdentityData;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.exchange.ClearAssociationRequest;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java Mon Nov  8 19:37:44 2010
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.au
 import org.apache.isis.core.metamodel.facets.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacetAbstract;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetAbstract;
 import org.apache.isis.remoting.data.common.EncodableObjectData;
 import org.apache.isis.remoting.data.common.IdentityData;
 import org.apache.isis.remoting.data.common.ObjectData;

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=1032676&r1=1032675&r2=1032676&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 19:37:44 2010
@@ -29,7 +29,7 @@ import org.apache.isis.core.commons.exce
 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.CollectionFacetAbstract;
+import org.apache.isis.core.progmodel.facets.collections.modify.CollectionFacetAbstract;
 import org.apache.isis.remoting.data.DummyCollectionData;
 import org.apache.isis.remoting.data.DummyObjectData;
 import org.apache.isis.remoting.data.common.CollectionData;

Modified: incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java Mon Nov  8 19:37:44 2010
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.webapp.IsisWebAppBootstrapper;
 import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
 import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
 import org.apache.isis.remoting.server.ServerConnection;
@@ -37,7 +38,6 @@ import org.apache.isis.remoting.server.S
 import org.apache.isis.remoting.transport.ServerConnectionHandler;
 import org.apache.isis.remoting.transport.simple.SimpleTransport;
 import org.apache.isis.runtime.system.IsisSystem;
-import org.apache.isis.webapp.IsisWebAppBootstrapper;
 
 /**
  * Analogous to {@link SocketsViewerAbstract}; both ultimately delegate to {@link ServerConnectionHandler}.

Modified: incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/guice/GuiceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/guice/GuiceTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/guice/GuiceTest.java (original)
+++ incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/guice/GuiceTest.java Mon Nov  8 19:37:44 2010
@@ -29,8 +29,8 @@ import static org.junit.Assert.assertTha
 import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.isis.common.jmock.AbstractJMockForInterfacesTest;
 import org.apache.isis.core.commons.guice.ScopeBindingModule;
+import org.apache.isis.core.testsupport.jmock.AbstractJMockForInterfacesTest;
 
 import com.google.inject.CreationException;
 import com.google.inject.Guice;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actcoll.typeof;
+package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacet.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.actcoll.typeof;
+package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
 import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actcoll.typeof;
+package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actcoll.typeof;
+package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actcoll.typeof;
+package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actcoll.typeof;
+package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actcoll.typeof;
+package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actcoll.typeof;
+package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions;
+package org.apache.isis.core.progmodel.facets.actions;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
@@ -41,14 +41,14 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 import org.apache.isis.core.metamodel.util.InvokeUtils;
 import org.apache.isis.core.metamodel.util.NameUtils;
-import org.apache.isis.metamodel.facets.actions.choices.ActionChoicesFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.choices.ActionParameterChoicesFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.defaults.ActionDefaultsFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.defaults.ActionParameterDefaultsFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.validate.ActionValidationFacetViaMethod;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacetInferred;
-import org.apache.isis.metamodel.java5.MethodPrefixBasedFacetFactoryAbstract;
+import org.apache.isis.core.progmodel.facets.actions.choices.ActionChoicesFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.actions.choices.ActionParameterChoicesFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.actions.defaults.ActionDefaultsFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.actions.defaults.ActionParameterDefaultsFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.actions.validate.ActionValidationFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.naming.named.NamedFacetInferred;
+import org.apache.isis.core.progmodel.java5.MethodPrefixBasedFacetFactoryAbstract;
 
 
 /**

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DebugFacetViaNamingConvention.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/DebugFacetViaNamingConvention.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DebugFacetViaNamingConvention.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DebugFacetViaNamingConvention.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/DebugFacetViaNamingConvention.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/DebugFacetViaNamingConvention.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DebugFacetViaNamingConvention.java Mon Nov  8 19:37:44 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions;
+package org.apache.isis.core.progmodel.facets.actions;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.actions.debug.DebugFacetAbstract;
+import org.apache.isis.core.progmodel.facets.actions.debug.DebugFacetAbstract;
 
 
 public class DebugFacetViaNamingConvention extends DebugFacetAbstract {

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DescribedAsFacetViaMethod.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/DescribedAsFacetViaMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DescribedAsFacetViaMethod.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DescribedAsFacetViaMethod.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/DescribedAsFacetViaMethod.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/DescribedAsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DescribedAsFacetViaMethod.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions;
+package org.apache.isis.core.progmodel.facets.actions;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -26,7 +26,7 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
+import org.apache.isis.core.progmodel.facets.naming.describedas.DescribedAsFacetAbstract;
 
 
 public class DescribedAsFacetViaMethod extends DescribedAsFacetAbstract implements ImperativeFacet {

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExecutedFacetViaNamingConvention.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ExecutedFacetViaNamingConvention.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExecutedFacetViaNamingConvention.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExecutedFacetViaNamingConvention.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ExecutedFacetViaNamingConvention.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ExecutedFacetViaNamingConvention.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExecutedFacetViaNamingConvention.java Mon Nov  8 19:37:44 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions;
+package org.apache.isis.core.progmodel.facets.actions;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.actions.executed.ExecutedFacetAbstract;
+import org.apache.isis.core.progmodel.facets.actions.executed.ExecutedFacetAbstract;
 
 
 public class ExecutedFacetViaNamingConvention extends ExecutedFacetAbstract {

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExplorationFacetViaNamingConvention.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ExplorationFacetViaNamingConvention.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExplorationFacetViaNamingConvention.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExplorationFacetViaNamingConvention.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ExplorationFacetViaNamingConvention.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ExplorationFacetViaNamingConvention.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExplorationFacetViaNamingConvention.java Mon Nov  8 19:37:44 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions;
+package org.apache.isis.core.progmodel.facets.actions;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.actions.exploration.ExplorationFacetAbstract;
+import org.apache.isis.core.progmodel.facets.actions.exploration.ExplorationFacetAbstract;
 
 
 public class ExplorationFacetViaNamingConvention extends ExplorationFacetAbstract {

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/IteratorFilteringFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/IteratorFilteringFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/IteratorFilteringFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/IteratorFilteringFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions;
+package org.apache.isis.core.progmodel.facets.actions;
 
 import java.lang.reflect.Method;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/MandatoryFacetOverriddenByMethod.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/MandatoryFacetOverriddenByMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/MandatoryFacetOverriddenByMethod.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/MandatoryFacetOverriddenByMethod.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/MandatoryFacetOverriddenByMethod.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/MandatoryFacetOverriddenByMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/MandatoryFacetOverriddenByMethod.java Mon Nov  8 19:37:44 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions;
+package org.apache.isis.core.progmodel.facets.actions;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.propparam.validate.mandatory.MandatoryFacetAbstract;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.MandatoryFacetAbstract;
 
 
 /**

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/NamedFacetViaMethod.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/NamedFacetViaMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/NamedFacetViaMethod.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/NamedFacetViaMethod.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/NamedFacetViaMethod.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/NamedFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/NamedFacetViaMethod.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions;
+package org.apache.isis.core.progmodel.facets.actions;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -26,7 +26,7 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
+import org.apache.isis.core.progmodel.facets.naming.named.NamedFacetAbstract;
 
 
 public class NamedFacetViaMethod extends NamedFacetAbstract implements ImperativeFacet {

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/SyntheticMethodFilteringFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/SyntheticMethodFilteringFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/SyntheticMethodFilteringFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/SyntheticMethodFilteringFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/SyntheticMethodFilteringFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/SyntheticMethodFilteringFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/SyntheticMethodFilteringFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions;
+package org.apache.isis.core.progmodel.facets.actions;
 
 import java.lang.reflect.Method;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacet.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.progmodel.facets.actions.choices;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.progmodel.facets.actions.choices;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetAbstract;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetNone.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetNone.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetNone.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetNone.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetNone.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetNone.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.progmodel.facets.actions.choices;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetViaMethod.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetViaMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetViaMethod.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetViaMethod.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetViaMethod.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetViaMethod.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.progmodel.facets.actions.choices;
 
 import java.lang.reflect.Method;
 import java.util.Collections;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacet.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.progmodel.facets.actions.choices;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.progmodel.facets.actions.choices;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetAbstract;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetNone.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetNone.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetNone.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetNone.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetNone.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetNone.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.progmodel.facets.actions.choices;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.choices;
+package org.apache.isis.core.progmodel.facets.actions.choices;
 
 import java.lang.reflect.Method;
 import java.util.Collections;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.debug;
+package org.apache.isis.core.progmodel.facets.actions.debug;
 
 import java.lang.reflect.Method;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacet.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.debug;
+package org.apache.isis.core.progmodel.facets.actions.debug;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.debug;
+package org.apache.isis.core.progmodel.facets.actions.debug;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAnnotation.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacetAnnotation.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAnnotation.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.debug;
+package org.apache.isis.core.progmodel.facets.actions.debug;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacet.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetAbstract;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetNone.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetNone.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetNone.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetNone.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetNone.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetNone.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetViaMethod;
 
 
 public class ActionDefaultsFacetViaMethod extends ActionDefaultsFacetAbstract implements ImperativeFacet {

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacet.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetAbstract;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.defaults;
+package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import java.lang.reflect.Method;
 import java.util.Collections;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.executed;
+package org.apache.isis.core.progmodel.facets.actions.executed;
 
 import java.lang.reflect.Method;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacet.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.actions.executed;
+package org.apache.isis.core.progmodel.facets.actions.executed;
 
 import org.apache.isis.core.metamodel.facets.EnumerationAbstract;
 import org.apache.isis.core.metamodel.facets.Facet;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.executed;
+package org.apache.isis.core.progmodel.facets.actions.executed;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAnnotation.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAnnotation.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAnnotation.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.executed;
+package org.apache.isis.core.progmodel.facets.actions.executed;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAtDefault.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAtDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAtDefault.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAtDefault.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAtDefault.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAtDefault.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAtDefault.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.executed;
+package org.apache.isis.core.progmodel.facets.actions.executed;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.executed;
+package org.apache.isis.core.progmodel.facets.actions.executed;
 
 import java.lang.reflect.Method;
 
@@ -29,9 +29,9 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.actions.ActionMethodsFacetFactory;
-import org.apache.isis.metamodel.facets.actions.ExecutedFacetViaNamingConvention;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacetInferred;
+import org.apache.isis.core.progmodel.facets.actions.ActionMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.ExecutedFacetViaNamingConvention;
+import org.apache.isis.core.progmodel.facets.naming.named.NamedFacetInferred;
 
 
 /**

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.exploration;
+package org.apache.isis.core.progmodel.facets.actions.exploration;
 
 import java.lang.reflect.Method;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacet.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.actions.exploration;
+package org.apache.isis.core.progmodel.facets.actions.exploration;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.exploration;
+package org.apache.isis.core.progmodel.facets.actions.exploration;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAnnotation.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacetAnnotation.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAnnotation.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.exploration;
+package org.apache.isis.core.progmodel.facets.actions.exploration;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacet.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.invoke;
+package org.apache.isis.core.progmodel.facets.actions.invoke;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.actions.invoke;
+package org.apache.isis.core.progmodel.facets.actions.invoke;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetAbstract;

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.actions.invoke;
+package org.apache.isis.core.progmodel.facets.actions.invoke;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;