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 [5/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/javassis...
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/TransportAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/TransportAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/TransportAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/TransportAbstract.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.remoting.transport;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
public abstract class TransportAbstract implements Transport {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/TransportConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/TransportConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/TransportConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/TransportConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.remoting.transport;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
public final class TransportConstants {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/simple/SimpleTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/simple/SimpleTransport.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/simple/SimpleTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/simple/SimpleTransport.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.remoting.transpo
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.remoting.transport.TransportAbstract;
/**
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.remoting.client;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.remoting.IsisRemoteException;
import org.apache.isis.remoting.data.DummyIdentityData;
import org.apache.isis.remoting.data.common.IdentityData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java Mon Nov 8 11:23:08 2010
@@ -26,14 +26,14 @@ import static org.junit.Assert.assertTru
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ObjectList;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectList;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.services.ServicesInjectorDefault;
import org.apache.isis.metamodel.services.container.DomainObjectContainerDefault;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.remoting.client.persistence.ClientSideTransactionManager;
import org.apache.isis.remoting.client.persistence.PersistenceSessionProxy;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java Mon Nov 8 11:23:08 2010
@@ -23,10 +23,10 @@ package org.apache.isis.remoting.client.
import static org.hamcrest.CoreMatchers.equalTo;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
import org.apache.isis.runtime.testsystem.TestProxySystem;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java Mon Nov 8 11:23:08 2010
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertEqu
import java.util.List;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.DummyNullValue;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyCollectionData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyCollectionData.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyCollectionData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyCollectionData.java Mon Nov 8 11:23:08 2010
@@ -22,8 +22,8 @@ package org.apache.isis.remoting.data;
import java.util.Arrays;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.remoting.data.common.CollectionData;
import org.apache.isis.remoting.data.common.ReferenceData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyIdentityData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyIdentityData.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyIdentityData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyIdentityData.java Mon Nov 8 11:23:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.remoting.data;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.remoting.data.common.IdentityData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyObjectData.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyObjectData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyObjectData.java Mon Nov 8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.remoting.data;
import java.util.Arrays;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.remoting.data.common.ObjectData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyReferenceData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyReferenceData.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyReferenceData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyReferenceData.java Mon Nov 8 11:23:08 2010
@@ -21,8 +21,8 @@
package org.apache.isis.remoting.data;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.remoting.data.common.IdentityData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthenticationRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthenticationRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthenticationRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthenticationRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -24,8 +24,8 @@ import static org.hamcrest.CoreMatchers.
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
public class AuthenticationRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestUsabilityEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestUsabilityEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestUsabilityEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestUsabilityEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.common.IdentityData;
import org.jmock.integration.junit4.JMock;
import org.junit.Ignore;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestVisibilityEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestVisibilityEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestVisibilityEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestVisibilityEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.common.IdentityData;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearAssociationRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearAssociationRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearAssociationRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearAssociationRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.common.IdentityData;
import org.junit.Before;
import org.junit.Ignore;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearValueRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearValueRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearValueRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearValueRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.common.IdentityData;
import org.junit.Before;
import org.junit.Ignore;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/CloseSessionRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/CloseSessionRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/CloseSessionRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/CloseSessionRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteClientActionRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteClientActionRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteClientActionRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteClientActionRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.common.ReferenceData;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteServerActionEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteServerActionEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteServerActionEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteServerActionEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,9 +26,9 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.common.ReferenceData;
import org.junit.Before;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/FindInstancesRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/FindInstancesRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/FindInstancesRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/FindInstancesRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.query.PersistenceQueryData;
import org.junit.Before;
import org.junit.Ignore;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetObjectRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetObjectRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetObjectRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetObjectRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,9 +26,9 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetPropertiesRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetPropertiesRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetPropertiesRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetPropertiesRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/HasInstancesRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/HasInstancesRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/HasInstancesRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/HasInstancesRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/OidForServiceRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/OidForServiceRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/OidForServiceRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/OidForServiceRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveFieldRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveFieldRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveFieldRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveFieldRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.common.IdentityData;
import org.junit.Before;
import org.junit.Ignore;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveObjectRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveObjectRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveObjectRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveObjectRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.common.IdentityData;
import org.junit.Before;
import org.junit.Ignore;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetAssociationRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetAssociationRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetAssociationRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetAssociationRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.common.IdentityData;
import org.junit.Before;
import org.junit.Ignore;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetValueRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetValueRequestEncodabilityTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetValueRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetValueRequestEncodabilityTest.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
import java.io.IOException;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.data.common.EncodableObjectData;
import org.apache.isis.remoting.data.common.IdentityData;
import org.junit.Before;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/facade/DummyServerFacade.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/facade/DummyServerFacade.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/facade/DummyServerFacade.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/facade/DummyServerFacade.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.remoting.facade;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.remoting.data.common.ObjectData;
import org.apache.isis.remoting.exchange.AuthorizationRequestUsability;
import org.apache.isis.remoting.exchange.AuthorizationRequestVisibility;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java Mon Nov 8 11:23:08 2010
@@ -26,10 +26,10 @@ import java.util.Vector;
import org.apache.commons.collections.CollectionUtils;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacetAbstract;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
import org.apache.isis.remoting.data.DummyCollectionData;
import org.apache.isis.remoting.data.DummyObjectData;
import org.apache.isis.remoting.data.common.CollectionData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java Mon Nov 8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.remoting.protoco
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java Mon Nov 8 11:23:08 2010
@@ -24,11 +24,11 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.fail;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.remoting.data.DummyReferenceData;
import org.apache.isis.remoting.data.common.ObjectData;
import org.apache.isis.remoting.exchange.ClearAssociationRequest;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
import org.apache.isis.remoting.data.DummyIdentityData;
import org.apache.isis.remoting.data.DummyObjectData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java Mon Nov 8 11:23:08 2010
@@ -24,13 +24,13 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.fail;
import org.apache.isis.core.commons.exceptions.IsisException;
-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.testspec.TestProxySpecification;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
import org.apache.isis.remoting.data.DummyEncodeableObjectData;
import org.apache.isis.remoting.data.DummyReferenceData;
import org.apache.isis.remoting.data.common.ObjectData;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java Mon Nov 8 11:23:08 2010
@@ -25,11 +25,11 @@ import static org.hamcrest.CoreMatchers.
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertEquals;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.remoting.data.DummyIdentityData;
import org.apache.isis.remoting.data.DummyObjectData;
import org.apache.isis.remoting.data.DummyReferenceData;
Modified: incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java Mon Nov 8 11:23:08 2010
@@ -27,14 +27,14 @@ import java.util.Map;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-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.DataOutputStreamExtended;
-import org.apache.isis.metamodel.encoding.DebugDataInputExtended;
-import org.apache.isis.metamodel.encoding.DebugDataOutputExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+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.DataOutputStreamExtended;
+import org.apache.isis.core.metamodel.encoding.DebugDataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DebugDataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.marshalling.MarshallerAbstract;
import org.apache.isis.remoting.marshalling.MarshallingConstants;
Modified: incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java Mon Nov 8 11:23:08 2010
@@ -28,7 +28,7 @@ import java.net.SocketException;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.marshalling.MarshallerAbstract;
import org.apache.isis.remoting.protocol.IllegalRequestException;
Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/shared/XStreamMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/shared/XStreamMarshaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/shared/XStreamMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/shared/XStreamMarshaller.java Mon Nov 8 11:23:08 2010
@@ -27,7 +27,7 @@ import java.io.StreamCorruptedException;
import java.net.SocketException;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.marshalling.MarshallerAbstract;
import org.apache.isis.remoting.protocol.IllegalRequestException;
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java Mon Nov 8 11:23:08 2010
@@ -30,7 +30,7 @@ import org.apache.commons.httpclient.Htt
import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.isis.core.commons.io.LazyInputStream;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.remoting.transport.TransportAbstract;
public class HttpClientTransport extends TransportAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.remoting.transport.http.client;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
public class HttpRemotingConstants {
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java Mon Nov 8 11:23:08 2010
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
import org.apache.isis.remoting.server.ServerConnection;
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.alternatives.remoting.transport.sockets.server;
import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransportConstants;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.runtime.viewer.IsisViewerInstaller;
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java Mon Nov 8 11:23:08 2010
@@ -31,7 +31,7 @@ import java.net.Socket;
import java.net.UnknownHostException;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.remoting.transport.ConnectionException;
import org.apache.isis.remoting.transport.ProfilingInputStream;
import org.apache.isis.remoting.transport.ProfilingOutputStream;
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.remoting.transport.sockets.shared;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.remoting.transport.TransportInstaller;
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java Mon Nov 8 11:23:08 2010
@@ -29,7 +29,7 @@ import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.DebugInfo;
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.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.remoting.exchange.OpenSessionRequest;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.exchange.ResponseEnvelope;
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authentication/standard/file/FileAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authentication/standard/file/FileAuthenticationManagerInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authentication/standard/file/FileAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authentication/standard/file/FileAuthenticationManagerInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authentication.standard.file;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
import org.apache.isis.runtime.authentication.standard.Authenticator;
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authentication/standard/file/FileAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authentication/standard/file/FileAuthenticator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authentication/standard/file/FileAuthenticator.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authentication/standard/file/FileAuthenticator.java Mon Nov 8 11:23:08 2010
@@ -31,7 +31,7 @@ import org.apache.isis.core.commons.ensu
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.io.IoUtils;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
-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;
import org.apache.isis.runtime.authentication.standard.PasswordRequestAuthenticatorAbstract;
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizationConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizationConstants.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizationConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authorization.standard.file;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.runtime.authorization.standard.AuthorizationConstants;
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizationManagerInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizationManagerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizationManagerInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authorization.standard.file;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
import org.apache.isis.runtime.authorization.standard.Authorizor;
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizor.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/authorization/standard/file/FileAuthorizor.java Mon Nov 8 11:23:08 2010
@@ -41,8 +41,8 @@ import org.apache.isis.applib.Identifier
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.spec.identifier.IdentifierFactory;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.spec.identifier.IdentifierFactory;
import org.apache.isis.runtime.authorization.standard.AuthorizorAbstract;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticationConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticationConstants.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticationConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authentication.standard.ldap;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
public final class LdapAuthenticationConstants {
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticationManagerInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticationManagerInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authentication.standard.ldap;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.standard.Authenticator;
import org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticator.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticator.java Mon Nov 8 11:23:08 2010
@@ -36,7 +36,7 @@ import javax.naming.directory.SearchResu
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
-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;
import org.apache.isis.runtime.authentication.standard.AuthenticatorAbstract;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizationConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizationConstants.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizationConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authorization.standard.ldap;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.runtime.authentication.standard.ldap.LdapAuthenticationConstants;
import org.apache.isis.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.runtime.authorization.standard.AuthorizationConstants;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizationManagerInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizationManagerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizationManagerInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authorization.standard.ldap;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
import org.apache.isis.runtime.authorization.standard.Authorizor;
Modified: incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizor.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/authorization/standard/ldap/LdapAuthorizor.java Mon Nov 8 11:23:08 2010
@@ -40,7 +40,7 @@ import javax.naming.directory.SearchResu
import org.apache.log4j.Logger;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authorization.standard.AuthorizorAbstract;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/Instance.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/Instance.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/Instance.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/Instance.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/Instance.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/Instance.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/Instance.java Mon Nov 8 11:23:08 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
-import org.apache.isis.metamodel.spec.Specification;
+import org.apache.isis.core.metamodel.spec.Specification;
/**
* Represents an instance of some element of the meta-model.
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/InstanceAbstract.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/InstanceAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/InstanceAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/InstanceAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/InstanceAbstract.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/InstanceAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/InstanceAbstract.java Mon Nov 8 11:23:08 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
-import org.apache.isis.metamodel.spec.Specification;
+import org.apache.isis.core.metamodel.spec.Specification;
public abstract class InstanceAbstract implements Instance {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/InvalidEntryException.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/InvalidEntryException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/InvalidEntryException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/InvalidEntryException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/InvalidEntryException.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/InvalidEntryException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/InvalidEntryException.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/LifeCycleEvent.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/LifeCycleEvent.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/LifeCycleEvent.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/MutableProposedHolder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/MutableProposedHolder.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/MutableProposedHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java Mon Nov 8 11:23:08 2010
@@ -18,10 +18,10 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
+import org.apache.isis.core.metamodel.spec.Specification;
import org.apache.isis.metamodel.interactions.ProposedHolder;
-import org.apache.isis.metamodel.spec.Specification;
/**
* Mix-in for {@link Instance} implementations, where can hold a
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapter.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapter.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java Mon Nov 8 11:23:08 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
/**
* Adapters to domain objects, where the application is written in terms of domain objects and those objects are
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectList.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectList.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectList.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectList.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectList.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectList.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectList.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import java.util.AbstractList;
import java.util.Arrays;
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.commons.collections.iterators.IteratorEnumeration;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class ObjectList extends AbstractList<ObjectAdapter> {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectMetaModel.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectMetaModel.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectMetaModel.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectMetaModel.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectMetaModel.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectMetaModel.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectMetaModel.java Mon Nov 8 11:23:08 2010
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Specification;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Specification;
/**
* Adapters to domain objects, where the application is written in terms of domain objects and those objects are
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveException.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ResolveException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ResolveException.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ResolveException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveException.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import org.apache.isis.core.commons.exceptions.IsisException;