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 [10/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/metamodel/src/test/java/org/apache/isis/core/metamodel/encoding/EncodabilityContractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/encoding/EncodabilityContractTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/encoding/EncodabilityContractTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/encoding/EncodabilityContractTest.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -33,11 +33,11 @@ import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.metamodel.encoding.DataOutputStreamExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.metamodel.encoding.Encodable;
public abstract class EncodabilityContractTest {
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/PersistableTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/PersistableTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/PersistableTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/PersistableTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/PersistableTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/PersistableTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/PersistableTest.java Mon Nov 8 11:23:08 2010
@@ -18,8 +18,10 @@
*/
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
+import org.apache.isis.core.metamodel.spec.Persistability;
+
import junit.framework.TestCase;
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,9 @@
*/
-package org.apache.isis.metamodel.spec.feature;
+package org.apache.isis.core.metamodel.spec.feature;
+
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import junit.framework.TestCase;
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTypeTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTypeTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTypeTest.java Mon Nov 8 11:23:08 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.metamodel.spec.feature;
+package org.apache.isis.core.metamodel.spec.feature;
-import org.apache.isis.metamodel.spec.Target;
+import org.apache.isis.core.metamodel.spec.Target;
import junit.framework.TestCase;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java (from r1032505, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/feature/ObjectAssociationFiltersTests.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/feature/ObjectAssociationFiltersTests.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/feature/ObjectAssociationFiltersTests.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.spec.feature;
+package org.apache.isis.core.metamodel.spec.feature;
import org.jmock.Expectations;
import org.jmock.Mockery;
@@ -29,8 +29,10 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.commons.filters.Filter;
-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;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
import org.apache.isis.metamodel.facets.hide.HiddenFacet;
@RunWith(JMock.class)
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java (from r1032505, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/testspec/TestProxySpecification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/testspec/TestProxySpecification.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/testspec/TestProxySpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.testspec;
+package org.apache.isis.core.metamodel.testspec;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,25 +29,25 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.factory.InstanceFactory;
import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Persistability;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Persistability;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociationFilters;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
public class TestProxySpecification extends FacetHolderImpl implements ObjectSpecification {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/util/NameUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/util/NameUtilTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/util/NameUtilTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/util/NameUtilTest.java Mon Nov 8 11:23:08 2010
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.metamodel.util;
+package org.apache.isis.core.metamodel.util;
import junit.framework.TestCase;
-import org.apache.isis.metamodel.util.NameUtils;
+import org.apache.isis.core.metamodel.util.NameUtils;
public class NameUtilTest extends TestCase {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/FacetAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/FacetAbstractTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/FacetAbstractTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/FacetAbstractTest.java Mon Nov 8 11:23:08 2010
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets
import junit.framework.TestCase;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ObjectNoop;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectNoop;
public class FacetAbstractTest extends TestCase {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/java5/ImperativeFacetUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/java5/ImperativeFacetUtilsTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/java5/ImperativeFacetUtilsTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/java5/ImperativeFacetUtilsTest.java Mon Nov 8 11:23:08 2010
@@ -35,9 +35,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.java5.ImperativeFacetUtils.ImperativeFacetFlags;
-import org.apache.isis.metamodel.spec.feature.ObjectMember;
@RunWith(JMock.class)
public class ImperativeFacetUtilsTest {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java Mon Nov 8 11:23:08 2010
@@ -23,10 +23,12 @@ package org.apache.isis.metamodel.runtim
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.spec.identifier.IdentifiedImpl;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.hide.HiddenFacet;
import org.apache.isis.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
@@ -35,8 +37,6 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.interactions.UsabilityContext;
import org.apache.isis.metamodel.interactions.VisibilityContext;
import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract.MemberType;
-import org.apache.isis.metamodel.spec.identifier.IdentifiedImpl;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java Mon Nov 8 11:23:08 2010
@@ -26,11 +26,11 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import org.apache.isis.applib.annotation.TypeOf;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
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.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactory.java Mon Nov 8 11:23:08 2010
@@ -27,7 +27,11 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.isis.applib.security.UserMemento;
-import org.apache.isis.metamodel.exceptions.ReflectionException;
+import org.apache.isis.core.metamodel.exceptions.ReflectionException;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.util.InvokeUtils;
+import org.apache.isis.core.metamodel.util.NameUtils;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetUtil;
@@ -43,12 +47,8 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.java5.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.specloader.internal.peer.JavaObjectActionPeer;
import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionParamPeer;
-import org.apache.isis.metamodel.util.InvokeUtils;
-import org.apache.isis.metamodel.util.NameUtils;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactory.java Mon Nov 8 11:23:08 2010
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.MethodFilteringFacetFactory;
import org.apache.isis.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.MethodScope;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/MandatoryFacetOverriddenByMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/MandatoryFacetOverriddenByMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/MandatoryFacetOverriddenByMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/MandatoryFacetOverriddenByMethod.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions;
-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.propparam.validate.mandatory.MandatoryFacetAbstract;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/SyntheticMethodFilteringFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/SyntheticMethodFilteringFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/SyntheticMethodFilteringFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/SyntheticMethodFilteringFacetFactory.java Mon Nov 8 11:23:08 2010
@@ -23,10 +23,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.facets.MethodFilteringFacetFactory;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.actions.choices;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetNone.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetNone.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions.choices;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.FacetHolder;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -25,15 +25,15 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.core.commons.lang.ArrayUtils;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.exceptions.ModelException;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.exceptions.ModelException;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.util.ObjectAdapterUtils;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.util.ObjectAdapterUtils;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class ActionChoicesFacetViaMethod extends ActionChoicesFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions.choices;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetNone.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetNone.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions.choices;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.FacetHolder;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -25,14 +25,14 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.core.commons.lang.ArrayUtils;
-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.util.ObjectAdapterUtils;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.util.ObjectAdapterUtils;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactory.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.Debug;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
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.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class DebugAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.actions.defaults;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetNone.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetNone.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions.defaults;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.FacetHolder;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,13 +24,13 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacetViaMethod;
import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class ActionDefaultsFacetViaMethod extends ActionDefaultsFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.actions.defaults;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions.defaults;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.FacetHolder;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class ActionParameterDefaultsFacetViaMethod extends ActionParameterDefaultsFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactory.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.Executed;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
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.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java Mon Nov 8 11:23:08 2010
@@ -19,9 +19,9 @@
package org.apache.isis.metamodel.facets.actions.executed;
+import org.apache.isis.core.metamodel.spec.Target;
import org.apache.isis.metamodel.facets.EnumerationAbstract;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.Target;
/**
* Whether the action should be invoked locally, remotely, or on the default location depending on its persistence
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacetAbstract.java Mon Nov 8 11:23:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.metamodel.facets.actions.executed;
+import org.apache.isis.core.metamodel.spec.Target;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.SingleValueFacetAbstract;
-import org.apache.isis.metamodel.spec.Target;
public abstract class ExecutedFacetAbstract extends SingleValueFacetAbstract implements ExecutedFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java Mon Nov 8 11:23:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.facets.FacetHolder;
@@ -30,7 +31,6 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.facets.actions.ActionMethodsFacetFactory;
import org.apache.isis.metamodel.facets.actions.ExecutedFacetViaNamingConvention;
import org.apache.isis.metamodel.facets.naming.named.NamedFacetInferred;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.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.Exploration;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
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.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class ExplorationAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.metamodel.facets.actions.invoke;
-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.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,14 +24,14 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-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.util.InvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.java5.ImperativeFacet;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.ReflectiveActionException;
-import org.apache.isis.metamodel.util.InvokeUtils;
import org.apache.log4j.Logger;
public class ActionInvocationFacetViaMethod extends ActionInvocationFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactory.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.NotContributed;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
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.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class NotContributedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactory.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.NotInRepositoryMenu;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
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.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class NotInRepositoryMenuAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactory.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.Prototype;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
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.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
public class PrototypeAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.actions.validate;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class ActionValidationFacetViaMethod extends ActionValidationFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFacetFactory.java Mon Nov 8 11:23:08 2010
@@ -20,6 +20,7 @@
package org.apache.isis.metamodel.facets.collections;
+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.MethodRemover;
@@ -29,7 +30,6 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactory.java Mon Nov 8 11:23:08 2010
@@ -27,6 +27,8 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.core.commons.lang.StringUtils;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.util.NameUtils;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetUtil;
@@ -46,9 +48,7 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.java5.PropertyOrCollectionIdentifyingFacetFactoryAbstract;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.specloader.internal.peer.JavaOneToManyAssociationPeer;
-import org.apache.isis.metamodel.util.NameUtils;
public class CollectionFieldMethodsFacetFactory extends PropertyOrCollectionIdentifyingFacetFactoryAbstract implements
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaArrayFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaArrayFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaArrayFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaArrayFacet.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.metamodel.facets
import java.util.ArrayList;
import java.util.Collection;
-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.collections.modify.CollectionFacetAbstract;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacet.java Mon Nov 8 11:23:08 2010
@@ -24,7 +24,7 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.commons.collections.CollectionUtils;
-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.collections.modify.CollectionFacetAbstract;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/ObjectToAdapterTransformer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/ObjectToAdapterTransformer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/ObjectToAdapterTransformer.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/ObjectToAdapterTransformer.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.metamodel.facets.collections;
import org.apache.commons.collections.Transformer;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java Mon Nov 8 11:23:08 2010
@@ -20,6 +20,7 @@
package org.apache.isis.metamodel.facets.collections.aggregated;
+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;
@@ -27,7 +28,6 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.facets.collections.CollectionFacetFactory;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.collections.modify;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java Mon Nov 8 11:23:08 2010
@@ -26,12 +26,12 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.IsisUtils;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.util.IsisUtils;
public class CollectionAddToFacetViaAccessor extends CollectionAddToFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class CollectionAddToFacetViaMethod extends CollectionAddToFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.collections.modify;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaAccessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaAccessor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaAccessor.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaAccessor.java Mon Nov 8 11:23:08 2010
@@ -26,11 +26,11 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class CollectionClearFacetViaAccessor extends CollectionClearFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class CollectionClearFacetViaMethod extends CollectionClearFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.util.Collection;
import java.util.Enumeration;
import java.util.Iterator;
-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.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacetAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacetAbstract.java Mon Nov 8 11:23:08 2010
@@ -25,7 +25,7 @@ import java.util.Enumeration;
import java.util.Iterator;
import org.apache.commons.collections.iterators.IteratorEnumeration;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.FacetAbstract;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.collections.modify;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java Mon Nov 8 11:23:08 2010
@@ -26,12 +26,12 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.IsisUtils;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.util.IsisUtils;
public class CollectionRemoveFromFacetViaAccessor extends CollectionRemoveFromFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class CollectionRemoveFromFacetViaMethod extends CollectionRemoveFromFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.collections.validate;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class CollectionValidateAddToFacetViaMethod extends CollectionValidateAddToFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.collections.validate;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class CollectionValidateRemoveFromFacetViaMethod extends CollectionValidateRemoveFromFacetAbstract implements
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.disable;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetAbstract.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.metamodel.facets.disable;
import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetAbstract;
import org.apache.isis.metamodel.facets.FacetHolder;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetNone.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetNone.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.disable;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.FacetHolder;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetViaMethod.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetViaMethod.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.util.ObjectInvokeUtils;
public class DisableForContextFacetViaMethod extends DisableForContextFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacet.java Mon Nov 8 11:23:08 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.disable;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetAbstract.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.metamodel.facets.disable;
import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetAbstract;
import org.apache.isis.metamodel.facets.FacetHolder;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetNone.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetNone.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.disable;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.metamodel.facets.FacetHolder;