incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1032676 [11/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/progmod...
Date Mon, 08 Nov 2010 19:38:12 GMT
Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.ordering.memberorder;
+package org.apache.isis.core.progmodel.facets.ordering.memberorder;
 
 import java.util.List;
 
@@ -28,7 +28,9 @@ import junit.framework.TestSuite;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
-import org.apache.isis.metamodel.facets.ordering.OrderSet;
+import org.apache.isis.core.progmodel.facets.ordering.OrderSet;
+import org.apache.isis.core.progmodel.facets.ordering.memberorder.DeweyOrderSet;
+import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderFacetAnnotation;
 
 
 public class DeweyOrderSetTest extends TestCase {

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.ordering.memberorder;
+package org.apache.isis.core.progmodel.facets.ordering.memberorder;
 
 import java.lang.reflect.Method;
 import java.util.Collection;
@@ -26,6 +26,9 @@ import java.util.Collection;
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderFacet;
+import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderFacetAnnotation;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java Mon Nov  8 19:37:44 2010
@@ -18,11 +18,13 @@
  */
 
 
-package org.apache.isis.metamodel.facets.ordering.memberorder;
+package org.apache.isis.core.progmodel.facets.ordering.memberorder;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderComparator;
+import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderFacetAnnotation;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 

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

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propcoll.notpersisted;
+package org.apache.isis.core.progmodel.facets.propcoll.notpersisted;
 
 import java.lang.reflect.Method;
 import java.util.Collection;
@@ -27,6 +27,8 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.progmodel.facets.propcoll.notpersisted.NotPersistedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propcoll.notpersisted.NotPersistedFacetAnnotation;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 
 

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.properties;
+package org.apache.isis.core.progmodel.facets.properties;
 
 import java.lang.reflect.Method;
 
@@ -35,31 +35,32 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.properties.modify.PropertyInitializationFacet;
 import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.progmodel.facets.actions.DescribedAsFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.actions.NamedFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.disable.DisableForContextFacet;
+import org.apache.isis.core.progmodel.facets.disable.DisableForContextFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.disable.DisableForSessionFacet;
+import org.apache.isis.core.progmodel.facets.disable.DisableForSessionFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.disable.DisabledFacet;
+import org.apache.isis.core.progmodel.facets.disable.DisabledFacetAlways;
+import org.apache.isis.core.progmodel.facets.hide.HiddenFacetAlways;
+import org.apache.isis.core.progmodel.facets.hide.HideForContextFacet;
+import org.apache.isis.core.progmodel.facets.hide.HideForContextFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.hide.HideForSessionFacet;
+import org.apache.isis.core.progmodel.facets.hide.HideForSessionFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.propcoll.access.PropertyAccessorFacetViaAccessor;
+import org.apache.isis.core.progmodel.facets.propcoll.derived.DerivedFacetInferred;
+import org.apache.isis.core.progmodel.facets.properties.PropertyMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.choices.PropertyChoicesFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.properties.defaults.PropertyDefaultFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertyClearFacetViaClearMethod;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertyClearFacetViaSetterMethod;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertyInitializationFacetViaSetterMethod;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetViaModifyMethod;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetViaSetterMethod;
+import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateFacet;
+import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateFacetViaMethod;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.actions.DescribedAsFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.NamedFacetViaMethod;
-import org.apache.isis.metamodel.facets.disable.DisableForContextFacet;
-import org.apache.isis.metamodel.facets.disable.DisableForContextFacetViaMethod;
-import org.apache.isis.metamodel.facets.disable.DisableForSessionFacet;
-import org.apache.isis.metamodel.facets.disable.DisableForSessionFacetViaMethod;
-import org.apache.isis.metamodel.facets.disable.DisabledFacet;
-import org.apache.isis.metamodel.facets.disable.DisabledFacetAlways;
-import org.apache.isis.metamodel.facets.hide.HiddenFacetAlways;
-import org.apache.isis.metamodel.facets.hide.HideForContextFacet;
-import org.apache.isis.metamodel.facets.hide.HideForContextFacetViaMethod;
-import org.apache.isis.metamodel.facets.hide.HideForSessionFacet;
-import org.apache.isis.metamodel.facets.hide.HideForSessionFacetViaMethod;
-import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacetViaAccessor;
-import org.apache.isis.metamodel.facets.propcoll.derived.DerivedFacetInferred;
-import org.apache.isis.metamodel.facets.properties.choices.PropertyChoicesFacetViaMethod;
-import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacetViaMethod;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacetViaClearMethod;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacetViaSetterMethod;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyInitializationFacetViaSetterMethod;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacetViaModifyMethod;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacetViaSetterMethod;
-import org.apache.isis.metamodel.facets.properties.validate.PropertyValidateFacet;
-import org.apache.isis.metamodel.facets.properties.validate.PropertyValidateFacetViaMethod;
 
 
 public class PropertyFieldMethodsFacetFactoryTest extends AbstractFacetFactoryTest {

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.multiline;
+package org.apache.isis.core.progmodel.facets.propparam.multiline;
 
 import java.lang.reflect.Method;
 
@@ -26,6 +26,8 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.progmodel.facets.propparam.multiline.MultiLineAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.multiline.MultiLineFacetAnnotation;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import org.apache.isis.applib.AbstractDomainObject;
 import org.apache.isis.applib.annotation.MustSatisfy;

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithoutMustSatisfyAnnotations.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithoutMustSatisfyAnnotations.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithoutMustSatisfyAnnotations.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithoutMustSatisfyAnnotations.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import org.apache.isis.applib.AbstractDomainObject;
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java Mon Nov  8 19:37:44 2010
@@ -18,8 +18,9 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
+import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacetFactory;
 import org.junit.Test;
 
 

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import static org.apache.isis.core.commons.matchers.NofMatchers.anInstanceOf;
 
@@ -35,6 +35,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacet;
+import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacetFactory;
 
 @RunWith(JMock.class)
 public class MustSatisfySpecificationFacetFactoryProcessParameterTest {

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import static org.apache.isis.core.commons.matchers.NofMatchers.anInstanceOf;
 
@@ -35,6 +35,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacet;
+import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacetFactory;
 
 @RunWith(JMock.class)
 public class MustSatisfySpecificationFacetFactoryProcessPropertyTest {

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -38,6 +38,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
 import org.apache.isis.core.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacet;
 
 
 @RunWith(JMock.class)

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -38,6 +38,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
 import org.apache.isis.core.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacet;
 
 
 @RunWith(JMock.class)

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAlwaysSatisfied.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAlwaysSatisfied.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAlwaysSatisfied.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAlwaysSatisfied.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import org.apache.isis.applib.spec.Specification;
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAndTests.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAndTests.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAndTests.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAndTests.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNeverSatisfied.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNeverSatisfied.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNeverSatisfied.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNeverSatisfied.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import org.apache.isis.applib.spec.Specification;
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNotTests.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNotTests.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNotTests.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNotTests.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationOrTests.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationOrTests.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationOrTests.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationOrTests.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationRequiresFirstLetterToBeUpperCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationRequiresFirstLetterToBeUpperCase.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationRequiresFirstLetterToBeUpperCase.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationRequiresFirstLetterToBeUpperCase.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import org.apache.isis.applib.spec.Specification;
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/Utils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/Utils.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/Utils.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/Utils.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.specification;
+package org.apache.isis.core.progmodel.facets.propparam.specification;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.typicallength;
+package org.apache.isis.core.progmodel.facets.propparam.typicallength;
 
 import java.lang.reflect.Method;
 
@@ -26,6 +26,8 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.TypicalLengthAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.TypicalLengthFacetAnnotation;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 
 

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.validate.mandatory;
+package org.apache.isis.core.progmodel.facets.propparam.validate.mandatory;
 
 import java.lang.reflect.Method;
 
@@ -26,6 +26,8 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.OptionalAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.OptionalFacet;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 
 

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.validate.mask;
+package org.apache.isis.core.progmodel.facets.propparam.validate.mask;
 
 import java.lang.reflect.Method;
 
@@ -27,6 +27,9 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskFacet;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskFacetAnnotation;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskEvaluatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskEvaluatorTest.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskEvaluatorTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskEvaluatorTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.validate.mask;
+package org.apache.isis.core.progmodel.facets.propparam.validate.mask;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -27,6 +27,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Locale;
 
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskEvaluator;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java Mon Nov  8 19:37:44 2010
@@ -18,13 +18,16 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.validate.regex;
+package org.apache.isis.core.progmodel.facets.propparam.validate.regex;
 
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.RegEx;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExFacet;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExFacetAnnotation;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 
 

Copied: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java (from r1032561, incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java?p2=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java&p1=incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java&r1=1032561&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facets.propparam.validate.regex;
+package org.apache.isis.core.progmodel.facets.propparam.validate.regex;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -31,6 +31,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExFacetAnnotation;
 
 
 @RunWith(JMock.class)

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTestCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTestCase.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTestCase.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTestCase.java Mon Nov  8 19:37:44 2010
@@ -23,7 +23,7 @@ package org.apache.isis.metamodel.value;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
-import static org.apache.isis.common.jmock.ReturnArgumentJMockAction.returnArgument;
+import static org.apache.isis.core.testsupport.jmock.ReturnArgumentJMockAction.returnArgument;
 
 import java.util.Locale;
 
@@ -42,8 +42,8 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacetUsingEncoderDecoder;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacetUsingParser;
+import org.apache.isis.core.progmodel.facets.object.encodeable.EncodableFacetUsingEncoderDecoder;
+import org.apache.isis.core.progmodel.facets.object.parseable.ParseableFacetUsingParser;
 
 
 @RunWith(JMock.class)

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java Mon Nov  8 19:37:44 2010
@@ -29,7 +29,7 @@ import java.lang.reflect.Method;
 import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 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.persistence.objectfactory.ObjectChanger;
 import org.apache.isis.runtime.persistence.objectfactory.ObjectResolver;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetLookup.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetLookup.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetLookup.java Mon Nov  8 19:37:44 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.help;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.help.HelpFacetAbstract;
+import org.apache.isis.core.progmodel.facets.help.HelpFacetAbstract;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/DescribedAsFacetWrapI18n.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/DescribedAsFacetWrapI18n.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/DescribedAsFacetWrapI18n.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/DescribedAsFacetWrapI18n.java Mon Nov  8 19:37:44 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.i18n.resourcebundle.facets;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
+import org.apache.isis.core.progmodel.facets.naming.describedas.DescribedAsFacetAbstract;
 
 
 public class DescribedAsFacetWrapI18n extends DescribedAsFacetAbstract {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/HelpFacetWrapI18n.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/HelpFacetWrapI18n.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/HelpFacetWrapI18n.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/HelpFacetWrapI18n.java Mon Nov  8 19:37:44 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.i18n.resourcebundle.facets;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.help.HelpFacetAbstract;
+import org.apache.isis.core.progmodel.facets.help.HelpFacetAbstract;
 
 
 public class HelpFacetWrapI18n extends HelpFacetAbstract {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/NamedFacetWrapI18n.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/NamedFacetWrapI18n.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/NamedFacetWrapI18n.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/NamedFacetWrapI18n.java Mon Nov  8 19:37:44 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.i18n.resourcebundle.facets;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
+import org.apache.isis.core.progmodel.facets.naming.named.NamedFacetAbstract;
 
 
 public class NamedFacetWrapI18n extends NamedFacetAbstract {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.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.facets.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacetAbstract;
+import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetAbstract;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.transaction.IsisTransactionManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java Mon Nov  8 19:37:44 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.transact
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 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.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.transaction.IsisTransactionManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java Mon Nov  8 19:37:44 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.transact
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacetAbstract;
+import org.apache.isis.core.progmodel.facets.collections.modify.CollectionClearFacetAbstract;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.transaction.IsisTransactionManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java Mon Nov  8 19:37:44 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.transact
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 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.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.transaction.IsisTransactionManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java Mon Nov  8 19:37:44 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.transact
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 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.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.transaction.IsisTransactionManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java Mon Nov  8 19:37:44 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.transact
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacetAbstract;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetAbstract;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.transaction.IsisTransactionManager;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtil_ValueAdapterTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtil_ValueAdapterTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtil_ValueAdapterTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtil_ValueAdapterTest.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.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
 import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacetAlways;
+import org.apache.isis.core.progmodel.facets.object.aggregated.AggregatedFacetAlways;
 import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.isis.runtime.testsystem.TestProxyField;
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionImplTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionImplTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionImplTest.java Mon Nov  8 19:37:44 2010
@@ -36,8 +36,8 @@ import org.apache.isis.core.metamodel.ru
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.internal.ObjectActionImpl;
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacetAbstract;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
+import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetAbstract;
+import org.apache.isis.core.progmodel.facets.naming.named.NamedFacetAbstract;
 import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.isis.runtime.testsystem.TestProxyAdapter;
 import org.apache.isis.runtime.testsystem.TestSpecification;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java Mon Nov  8 19:37:44 2010
@@ -44,15 +44,15 @@ import org.apache.isis.core.metamodel.ru
 import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.identifier.IdentifiedImpl;
-import org.apache.isis.metamodel.facets.disable.DisableForSessionFacetAbstract;
-import org.apache.isis.metamodel.facets.hide.HiddenFacetAbstract;
-import org.apache.isis.metamodel.facets.hide.HiddenFacetAlways;
-import org.apache.isis.metamodel.facets.hide.HiddenFacetImpl;
-import org.apache.isis.metamodel.facets.hide.HiddenFacetNever;
-import org.apache.isis.metamodel.facets.hide.HideForContextFacetNone;
-import org.apache.isis.metamodel.facets.hide.HideForSessionFacetAbstract;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
+import org.apache.isis.core.progmodel.facets.disable.DisableForSessionFacetAbstract;
+import org.apache.isis.core.progmodel.facets.hide.HiddenFacetAbstract;
+import org.apache.isis.core.progmodel.facets.hide.HiddenFacetAlways;
+import org.apache.isis.core.progmodel.facets.hide.HiddenFacetImpl;
+import org.apache.isis.core.progmodel.facets.hide.HiddenFacetNever;
+import org.apache.isis.core.progmodel.facets.hide.HideForContextFacetNone;
+import org.apache.isis.core.progmodel.facets.hide.HideForSessionFacetAbstract;
+import org.apache.isis.core.progmodel.facets.naming.describedas.DescribedAsFacetAbstract;
+import org.apache.isis.core.progmodel.facets.naming.named.NamedFacetAbstract;
 import org.apache.isis.runtime.testsystem.TestProxySystem;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java Mon Nov  8 19:37:44 2010
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.ObjectReflector;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
+import org.apache.isis.core.progmodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authorization.AuthorizationManager;
 import org.apache.isis.runtime.context.IsisContext;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/TestProxyOid_ValueType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/TestProxyOid_ValueType.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/TestProxyOid_ValueType.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/TestProxyOid_ValueType.java Mon Nov  8 19:37:44 2010
@@ -3,8 +3,8 @@ package org.apache.isis.runtime.testsyst
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.isis.core.testsupport.value.ValueTypeContractTestAbstract;
 import org.apache.isis.runtime.testsystem.TestProxyOid;
-import org.apache.isis.testsupport.ValueTypeContractTestAbstract;
 
 public class TestProxyOid_ValueType extends ValueTypeContractTestAbstract<TestProxyOid> {
 

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockForClassesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockForClassesTest.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockForClassesTest.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockForClassesTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 
 public abstract class AbstractJMockForClassesTest extends AbstractJMockTest {

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockForInterfacesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockForInterfacesTest.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockForInterfacesTest.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockForInterfacesTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 
 public abstract class AbstractJMockForInterfacesTest extends AbstractJMockTest {

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockTest.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockTest.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/AbstractJMockTest.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 import org.junit.Rule;
 

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/ConvenienceMockery.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/ConvenienceMockery.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/ConvenienceMockery.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/ConvenienceMockery.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 import org.jmock.Expectations;
 import org.jmock.Mockery;

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/DelegatingMockery.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/DelegatingMockery.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/DelegatingMockery.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/DelegatingMockery.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 import org.hamcrest.Description;
 import org.jmock.Mockery;

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/Fixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/Fixture.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/Fixture.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/Fixture.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 /**
  * Represents something to be setup within a test; typically a collaborator of some

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/FixtureMockery.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/FixtureMockery.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/FixtureMockery.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/FixtureMockery.java Mon Nov  8 19:37:44 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 
 import org.jmock.Mockery;
-import org.apache.isis.common.jmock.MockFixture.Builder;
+import org.apache.isis.core.testsupport.jmock.MockFixture.Builder;
 
 public class FixtureMockery extends DelegatingMockery {
 	

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/InjectIntoJMockAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/InjectIntoJMockAction.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/InjectIntoJMockAction.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/InjectIntoJMockAction.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 import java.lang.reflect.Method;
 

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/JMockContextBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/JMockContextBuilder.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/JMockContextBuilder.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/JMockContextBuilder.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JUnit4Mockery;

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/JMockRule.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/JMockRule.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/JMockRule.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/JMockRule.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 import java.lang.reflect.Field;
 

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/MockFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/MockFixture.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/MockFixture.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/MockFixture.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 
 /**

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/MockFixtureAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/MockFixtureAdapter.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/MockFixtureAdapter.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/MockFixtureAdapter.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 import org.jmock.Mockery;
 

Modified: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/ReturnArgumentJMockAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/ReturnArgumentJMockAction.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/ReturnArgumentJMockAction.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/jmock/ReturnArgumentJMockAction.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.common.jmock;
+package org.apache.isis.core.testsupport.jmock;
 
 import org.hamcrest.Description;
 import org.jmock.api.Action;

Copied: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract.java (from r1032552, incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/testsupport/ValueTypeContractTestAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract.java?p2=incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract.java&p1=incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/testsupport/ValueTypeContractTestAbstract.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/testsupport/ValueTypeContractTestAbstract.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract.java Mon Nov  8 19:37:44 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.testsupport;
+package org.apache.isis.core.testsupport.value;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;

Modified: incubator/isis/trunk/core/testsupport/src/test/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/test/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/test/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java (original)
+++ incubator/isis/trunk/core/testsupport/src/test/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java Mon Nov  8 19:37:44 2010
@@ -1,9 +1,11 @@
-package org.apache.isis.testsupport;
+package org.apache.isis.core.testsupport.value;
 
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.isis.core.testsupport.value.ValueTypeContractTestAbstract;
+
 public class ValueTypeContractTestAbstract_BigIntegerTest extends ValueTypeContractTestAbstract<BigInteger> {
 
 	@Override

Modified: incubator/isis/trunk/core/testsupport/src/test/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract_StringTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/test/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract_StringTest.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/test/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract_StringTest.java (original)
+++ incubator/isis/trunk/core/testsupport/src/test/java/org/apache/isis/core/testsupport/value/ValueTypeContractTestAbstract_StringTest.java Mon Nov  8 19:37:44 2010
@@ -1,8 +1,10 @@
-package org.apache.isis.testsupport;
+package org.apache.isis.core.testsupport.value;
 
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.isis.core.testsupport.value.ValueTypeContractTestAbstract;
+
 public class ValueTypeContractTestAbstract_StringTest extends ValueTypeContractTestAbstract<String> {
 
 	@Override

Copied: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/ConfigurationBuilderServletContext.java (from r1032552, incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ConfigurationBuilderServletContext.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/ConfigurationBuilderServletContext.java?p2=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/ConfigurationBuilderServletContext.java&p1=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ConfigurationBuilderServletContext.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ConfigurationBuilderServletContext.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/ConfigurationBuilderServletContext.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.webapp;
+package org.apache.isis.core.webapp;
 
 import javax.servlet.ServletContext;
 

Copied: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java (from r1032552, incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisSessionFilter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java?p2=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java&p1=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisSessionFilter.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisSessionFilter.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.webapp;
+package org.apache.isis.core.webapp;
 
 import java.io.IOException;
 
@@ -33,10 +33,10 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.isis.core.commons.factory.InstanceFactory;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.webapp.auth.AuthenticationSessionLookupStrategy;
+import org.apache.isis.core.webapp.auth.AuthenticationSessionLookupStrategyDefault;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.webapp.auth.AuthenticationSessionLookupStrategy;
-import org.apache.isis.webapp.auth.AuthenticationSessionLookupStrategyDefault;
 
 
 public class IsisSessionFilter implements Filter {

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

Copied: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/ResourceStreamSourceServletContext.java (from r1032552, incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ResourceStreamSourceServletContext.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/ResourceStreamSourceServletContext.java?p2=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/ResourceStreamSourceServletContext.java&p1=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ResourceStreamSourceServletContext.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ResourceStreamSourceServletContext.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/ResourceStreamSourceServletContext.java Mon Nov  8 19:37:44 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.webapp;
+package org.apache.isis.core.webapp;
 
 import java.io.IOException;
 import java.io.InputStream;



Mime
View raw message