You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/11/08 12:23:54 UTC
svn commit: r1032543 [15/26] - in /incubator/isis/trunk:
alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/
alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassi...
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java Mon Nov 8 11:23:08 2010
@@ -21,9 +21,9 @@
package org.apache.isis.metamodel.facets.ordering.fieldorder;
import org.apache.isis.applib.annotation.FieldOrder;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class FieldOrderAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: 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/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java Mon Nov 8 11:23:08 2010
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class MemberOrderAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: 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/metamodel/facets/ordering/memberorder/MemberPeerStub.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/ordering/memberorder/MemberPeerStub.java Mon Nov 8 11:23:08 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.metamodel.facets.NamedAndDescribedFacetHolderImpl;
import org.apache.isis.metamodel.specloader.internal.peer.ObjectMemberPeer;
Modified: 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/metamodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java Mon Nov 8 11:23:08 2010
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.isis.applib.annotation.NotPersisted;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class NotPersistedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: 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/metamodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java Mon Nov 8 11:23:08 2010
@@ -23,6 +23,7 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.security.UserMemento;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.actions.DescribedAsFacetViaMethod;
@@ -59,7 +60,6 @@ import org.apache.isis.metamodel.facets.
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;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class PropertyFieldMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: 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/metamodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java Mon Nov 8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.MultiLine;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class MultiLineAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: 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/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java Mon Nov 8 11:23:08 2010
@@ -34,10 +34,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.interactions.PropertyModifyContext;
-import org.apache.isis.metamodel.spec.identifier.Identified;
@RunWith(JMock.class)
Modified: 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/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java Mon Nov 8 11:23:08 2010
@@ -34,10 +34,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.interactions.PropertyModifyContext;
-import org.apache.isis.metamodel.spec.identifier.Identified;
@RunWith(JMock.class)
Modified: 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/metamodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java Mon Nov 8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.TypicalLength;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class TypicalLengthAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: 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/metamodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java Mon Nov 8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Optional;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class OptionalAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: 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/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java Mon Nov 8 11:23:08 2010
@@ -23,11 +23,11 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Mask;
+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.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: 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/metamodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&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/metamodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java Mon Nov 8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.RegEx;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class RegExAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigDecimalValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigDecimalValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigDecimalValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigDecimalValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -30,7 +30,7 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigIntValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigIntValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigIntValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigIntValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -30,7 +30,7 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BooleanValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BooleanValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BooleanValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BooleanValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -27,7 +27,7 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ByteValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ByteValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ByteValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ByteValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -28,7 +28,7 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/CharacterValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/CharacterValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/CharacterValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/CharacterValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -27,8 +27,8 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.InvalidEntryException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ColorValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ColorValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ColorValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ColorValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -29,7 +29,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Color;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DoubleValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DoubleValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DoubleValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DoubleValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -28,7 +28,7 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/FloatValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/FloatValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/FloatValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/FloatValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -28,7 +28,7 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstractTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstractTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstractTest.java Mon Nov 8 11:23:08 2010
@@ -29,7 +29,7 @@ import org.jmock.integration.junit4.JMoc
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/IntValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/IntValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/IntValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/IntValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -28,7 +28,7 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlDateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlDateValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlDateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlDateValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -33,7 +33,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.TestClock;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -31,7 +31,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.TestClock;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaUtilDateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaUtilDateValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaUtilDateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaUtilDateValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -33,7 +33,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.TestClock;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -28,7 +28,7 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -30,7 +30,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Money;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PolishMoneyValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PolishMoneyValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PolishMoneyValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PolishMoneyValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -31,7 +31,7 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Money;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderTest.java Mon Nov 8 11:23:08 2010
@@ -28,7 +28,7 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -35,8 +35,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacetUsingEncoderDecoder;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManager.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManager.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManager.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.runtime.authentication;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
public interface AuthenticationManager extends ApplicationScopedComponent {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticationManagerStandard.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticationManagerStandard.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticationManagerStandard.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticationManagerStandard.java Mon Nov 8 11:23:08 2010
@@ -30,8 +30,8 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authentication.AuthenticationRequest;
import org.apache.isis.runtime.authentication.NoAuthenticatorException;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java Mon Nov 8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.authenti
import java.util.List;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
import org.apache.isis.runtime.installers.InstallerAbstract;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/Authenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/Authenticator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/Authenticator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/Authenticator.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.runtime.authentication.standard;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.authentication.AuthenticationRequest;
public interface Authenticator extends ApplicationScopedComponent {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticatorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticatorAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticatorAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/AuthenticatorAbstract.java Mon Nov 8 11:23:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.runtime.authentication.standard;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.AuthenticationRequest;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.SystemConstants;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authentication.standard;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.AuthenticationRequest;
import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/SimpleSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/SimpleSession.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/SimpleSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/SimpleSession.java Mon Nov 8 11:23:08 2010
@@ -24,8 +24,8 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
public final class SimpleSession extends AuthenticationSessionAbstract {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticator.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.AuthenticationRequest;
import org.apache.isis.runtime.authentication.standard.AuthenticatorAbstract;
import org.apache.isis.runtime.authentication.standard.SimpleSession;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticatorConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticatorConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticatorConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticatorConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authentication.standard.exploration;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
public final class ExplorationAuthenticatorConstants {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationSession.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationSession.java Mon Nov 8 11:23:08 2010
@@ -22,11 +22,11 @@ package org.apache.isis.runtime.authenti
import java.io.IOException;
-import org.apache.isis.metamodel.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.Encodable;
public final class ExplorationSession extends AuthenticationSessionAbstract implements Encodable {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/MultiUserExplorationSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/MultiUserExplorationSession.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/MultiUserExplorationSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/exploration/MultiUserExplorationSession.java Mon Nov 8 11:23:08 2010
@@ -27,10 +27,10 @@ import java.util.List;
import java.util.Set;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.runtime.authentication.standard.SimpleSession;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authentication.standard.fixture;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.AuthenticationRequest;
import org.apache.isis.runtime.authentication.standard.AuthenticatorAbstract;
import org.apache.isis.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/singleuser/SingleUserSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/singleuser/SingleUserSession.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/singleuser/SingleUserSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/singleuser/SingleUserSession.java Mon Nov 8 11:23:08 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.authenti
import java.io.IOException;
-import org.apache.isis.metamodel.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.Encodable;
public final class SingleUserSession extends AuthenticationSessionAbstract implements Encodable {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/AuthorizationManager.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/AuthorizationManager.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/AuthorizationManager.java Mon Nov 8 11:23:08 2010
@@ -22,8 +22,8 @@ package org.apache.isis.runtime.authoriz
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/AuthorizationManagerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/AuthorizationManagerAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/AuthorizationManagerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/AuthorizationManagerAbstract.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authorization;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
public abstract class AuthorizationManagerAbstract implements AuthorizationManager {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/package-info.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/package-info.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/package-info.java Mon Nov 8 11:23:08 2010
@@ -27,7 +27,7 @@
* <li>in prototyping or single user, used by the {@link org.apache.isis.runtime.authorization.standard.AuthorizationFacetFactoryImpl facet factory}
* implementations, that is, enforcing authorization on the "client-side".
* </li>
- * <li>In client/server mode, used by a {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator} for proxy authorization,
+ * <li>In client/server mode, used by a {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator} for proxy authorization,
* that is, enforcing authorization by delegating to the "server-side".</li>
* </ul>
*/
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authorization.standard;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
public final class AuthorizationConstants {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java Mon Nov 8 11:23:08 2010
@@ -22,11 +22,11 @@ package org.apache.isis.runtime.authoriz
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetUtil;
import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.runtime.authorization.AuthorizationManager;
import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandard.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandard.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandard.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandard.java Mon Nov 8 11:23:08 2010
@@ -21,9 +21,9 @@
package org.apache.isis.runtime.authorization.standard;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authorization.AuthorizationManagerAbstract;
public class AuthorizationManagerStandard extends AuthorizationManagerAbstract {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java Mon Nov 8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.authoriz
import java.util.List;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authorization.AuthorizationManager;
import org.apache.isis.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.runtime.installers.InstallerAbstract;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizorAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizorAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizorAbstract.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authorization.standard;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
public abstract class AuthorizorAbstract implements Authorizor {
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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -26,9 +26,9 @@ import static org.apache.isis.core.commo
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.java5.ImperativeFacet;
import org.apache.isis.metamodel.spec.JavaSpecification;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
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/context/IsisContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java Mon Nov 8 11:23:08 2010
@@ -26,9 +26,9 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebugList;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.ConfigurationException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.ConfigurationException;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authorization.AuthorizationManager;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextPipe.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextPipe.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextPipe.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextPipe.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.context;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextStatic.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextStatic.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextStatic.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextStatic.java Mon Nov 8 11:23:08 2010
@@ -24,7 +24,7 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.commons.lang.Maybe;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextThreadLocal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextThreadLocal.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextThreadLocal.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextThreadLocal.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistor.java Mon Nov 8 11:23:08 2010
@@ -31,14 +31,14 @@ import java.util.Map;
import java.util.Set;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.ObjectSpecificationException;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.util.CollectionFacetUtils;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.fixturesinstaller.FixtureException;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureService.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureService.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureService.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureService.java Mon Nov 8 11:23:08 2010
@@ -35,12 +35,12 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Persistability;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Persistability;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtime.context.IsisContext;
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/SwitchUserServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/SwitchUserServiceImpl.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/SwitchUserServiceImpl.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/SwitchUserServiceImpl.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.fixtures
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.applib.switchuser.SwitchUserService;
import org.apache.isis.applib.switchuser.SwitchUserServiceAware;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/config/FixturesFromConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/config/FixturesFromConfiguration.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/config/FixturesFromConfiguration.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/config/FixturesFromConfiguration.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.fixtures
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.factory.InstanceFactory;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.runtime.fixture.ObjectLoaderFixture;
import org.apache.isis.runtime.fixturesinstaller.FixturesInstallerAbstract;
import org.apache.isis.runtime.fixturesinstaller.FixturesInstallerDelegate;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetDecorator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetDecorator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetDecorator.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.help;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
public interface HelpFacetDecorator extends FacetDecorator {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/StandardHelpFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/StandardHelpFacetDecorator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/StandardHelpFacetDecorator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/StandardHelpFacetDecorator.java Mon Nov 8 11:23:08 2010
@@ -21,11 +21,11 @@
package org.apache.isis.runtime.help;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.facetdecorator.FacetDecoratorAbstract;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorAbstract;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.help.HelpFacet;
-import org.apache.isis.metamodel.spec.identifier.Identified;
public class StandardHelpFacetDecorator extends FacetDecoratorAbstract implements HelpFacetDecorator {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpDecoratorInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpDecoratorInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpDecoratorInstaller.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.help.fil
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
import org.apache.isis.runtime.help.StandardHelpFacetDecorator;
import org.apache.isis.runtime.installers.InstallerAbstract;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpManager.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpManager.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpManager.java Mon Nov 8 11:23:08 2010
@@ -28,7 +28,7 @@ import java.io.IOException;
import org.apache.log4j.Logger;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.help.HelpManagerAbstract;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/package-info.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/package-info.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/package-info.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
/**
- * Help API, utilizing the {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator} mechanism..
+ * Help API, utilizing the {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator} mechanism..
*
* <p>
* Concrete implementations are in the <tt>help-xxx</tt> modules. Note at the time of writing - unlike
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/I18nFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/I18nFacetDecorator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/I18nFacetDecorator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/I18nFacetDecorator.java Mon Nov 8 11:23:08 2010
@@ -21,13 +21,13 @@
package org.apache.isis.runtime.i18n.resourcebundle;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.facetdecorator.FacetDecoratorAbstract;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorAbstract;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.help.HelpFacet;
import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
-import org.apache.isis.metamodel.spec.identifier.Identified;
import org.apache.isis.runtime.i18n.resourcebundle.facets.DescribedAsFacetWrapI18n;
import org.apache.isis.runtime.i18n.resourcebundle.facets.HelpFacetWrapI18n;
import org.apache.isis.runtime.i18n.resourcebundle.facets.NamedFacetWrapI18n;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nDecoratorInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nDecoratorInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nDecoratorInstaller.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.i18n.res
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
import org.apache.isis.runtime.installers.InstallerAbstract;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nManager.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nManager.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nManager.java Mon Nov 8 11:23:08 2010
@@ -25,7 +25,7 @@ import java.util.ResourceBundle;
import org.apache.log4j.Logger;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
public class ResourceBasedI18nManager implements I18nManager {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/imageloader/awt/ImageConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/imageloader/awt/ImageConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/imageloader/awt/ImageConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/imageloader/awt/ImageConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.imageloader.awt;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
public class ImageConstants {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/imageloader/awt/TemplateImageLoaderAwt.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/imageloader/awt/TemplateImageLoaderAwt.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/imageloader/awt/TemplateImageLoaderAwt.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/imageloader/awt/TemplateImageLoaderAwt.java Mon Nov 8 11:23:08 2010
@@ -38,7 +38,7 @@ import java.util.Vector;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.lang.Resources;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.imageloader.TemplateImage;
import org.apache.isis.runtime.imageloader.TemplateImageImpl;
import org.apache.isis.runtime.imageloader.TemplateImageLoader;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerAbstract.java Mon Nov 8 11:23:08 2010
@@ -24,9 +24,9 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.config.ConfigurationBuilderAware;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderAware;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
import com.google.inject.Module;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java Mon Nov 8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.runtime.installe
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.config.ConfigurationBuilderAware;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderAware;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java Mon Nov 8 11:23:08 2010
@@ -41,9 +41,9 @@ import org.apache.isis.core.commons.fact
import org.apache.isis.core.commons.factory.UnavailableClassException;
import org.apache.isis.core.commons.lang.CastUtils;
import org.apache.isis.core.commons.lang.StringUtils;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.config.NotFoundPolicy;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.NotFoundPolicy;
import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
import org.apache.isis.runtime.about.AboutIsis;