svn commit: r1032676 [5/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...

[da...@apache.org]

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

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

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/RemoveCallbackFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/RemoveCallbackFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/RemoveCallbackFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/RemoveCallbackFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.object.callbacks;
+package org.apache.isis.core.progmodel.facets.object.callbacks;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.fa
 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.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.java5.MethodPrefixBasedFacetFactoryAbstract;
+import org.apache.isis.core.progmodel.java5.MethodPrefixBasedFacetFactoryAbstract;
 
 
 public class RemoveCallbackFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {

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

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

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

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

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/SaveCallbackFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/SaveCallbackFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/SaveCallbackFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/SaveCallbackFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/SaveCallbackFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/SaveCallbackFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/SaveCallbackFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.object.callbacks;
+package org.apache.isis.core.progmodel.facets.object.callbacks;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.fa
 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.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.java5.MethodPrefixBasedFacetFactoryAbstract;
+import org.apache.isis.core.progmodel.java5.MethodPrefixBasedFacetFactoryAbstract;
 
 
 public class SaveCallbackFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/UpdateCallbackFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/UpdateCallbackFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/UpdateCallbackFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/UpdateCallbackFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.object.callbacks;
+package org.apache.isis.core.progmodel.facets.object.callbacks;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.FacetUtil;
 import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.java5.MethodPrefixBasedFacetFactoryAbstract;
+import org.apache.isis.core.progmodel.java5.MethodPrefixBasedFacetFactoryAbstract;
 
 
 public class UpdateCallbackFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/ClearDirtyObjectFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/ClearDirtyObjectFacet.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/ClearDirtyObjectFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/ClearDirtyObjectFacet.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.object.dirty;
+package org.apache.isis.core.progmodel.facets.object.dirty;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

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

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/DirtyMethodsFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/DirtyMethodsFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/DirtyMethodsFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/DirtyMethodsFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.object.dirty;
+package org.apache.isis.core.progmodel.facets.object.dirty;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.FacetUtil;
 import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.java5.MethodPrefixBasedFacetFactoryAbstract;
+import org.apache.isis.core.progmodel.java5.MethodPrefixBasedFacetFactoryAbstract;
 
 
 

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

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

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/IsDirtyObjectFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/IsDirtyObjectFacet.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/IsDirtyObjectFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/IsDirtyObjectFacet.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.object.dirty;
+package org.apache.isis.core.progmodel.facets.object.dirty;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

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

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/MarkDirtyObjectFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/MarkDirtyObjectFacet.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/MarkDirtyObjectFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/MarkDirtyObjectFacet.java Mon Nov  8 19:37:44 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.object.dirty;
+package org.apache.isis.core.progmodel.facets.object.dirty;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacet.java Mon Nov  8 19:37:44 2010
@@ -17,13 +17,13 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.object.ident.icon;
+package org.apache.isis.core.progmodel.facets.object.ident.icon;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
-import org.apache.isis.metamodel.facets.object.ident.plural.PluralFacet;
-import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
 
 /**
  * Mechanism for obtaining the name of the icon for <i>this instance</i> of a class.

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

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconMethodFacetFactory.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconMethodFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconMethodFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactory.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconMethodFacetFactory.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.object.ident.icon;
+package org.apache.isis.core.progmodel.facets.object.ident.icon;
 
 import java.lang.reflect.Method;
 
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.FacetUtil;
 import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.java5.MethodPrefixBasedFacetFactoryAbstract;
+import org.apache.isis.core.progmodel.java5.MethodPrefixBasedFacetFactoryAbstract;
 
 
 public class IconMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {

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

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacet.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacet.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacet.java Mon Nov  8 19:37:44 2010
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.facets.object.ident.plural;
+package org.apache.isis.core.progmodel.facets.object.ident.plural;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.metamodel.facets.object.ident.icon.IconFacet;
-import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.progmodel.facets.object.ident.icon.IconFacet;
+import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
 
 /**
  * Mechanism for obtaining the plural title of an instance of a class, used to label a collection of a certain class.

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAbstract.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAbstract.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAbstract.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.object.ident.plural;
+package org.apache.isis.core.progmodel.facets.object.ident.plural;
 
 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/object/ident/plural/PluralFacetAnnotation.java (from r1032561, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAnnotation.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAnnotation.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.object.ident.plural;
+package org.apache.isis.core.progmodel.facets.object.ident.plural;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;