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/16 13:29:22 UTC
svn commit: r1035613 [2/7] - in /incubator/isis/trunk: ./
alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/
alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql...
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStore.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStore.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStore.java Tue Nov 16 12:29:07 2010
@@ -39,6 +39,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.xml.objectstore.internal.clock.Clock;
import org.apache.isis.extensions.xml.objectstore.internal.commands.XmlCreateObjectCommand;
import org.apache.isis.extensions.xml.objectstore.internal.commands.XmlDestroyObjectCommand;
@@ -54,7 +55,6 @@ import org.apache.isis.extensions.xml.ob
import org.apache.isis.extensions.xml.objectstore.internal.services.ServiceManager;
import org.apache.isis.extensions.xml.objectstore.internal.services.xml.XmlServiceManager;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistorUtil;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManager.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManager.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManager.java Tue Nov 16 12:29:07 2010
@@ -27,6 +27,7 @@ import java.util.Vector;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.xml.objectstore.internal.data.CollectionData;
import org.apache.isis.extensions.xml.objectstore.internal.data.Data;
import org.apache.isis.extensions.xml.objectstore.internal.data.DataManager;
@@ -35,7 +36,6 @@ import org.apache.isis.extensions.xml.ob
import org.apache.isis.extensions.xml.objectstore.internal.data.PersistorException;
import org.apache.isis.extensions.xml.objectstore.internal.data.ReferenceVector;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.runtime.transaction.ObjectPersistenceException;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileContentWriter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileContentWriter.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileContentWriter.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileContentWriter.java Tue Nov 16 12:29:07 2010
@@ -29,8 +29,8 @@ import java.util.Iterator;
import org.apache.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.xml.objectstore.internal.data.xml.ContentWriter;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.services.ServiceUtil;
import org.apache.isis.runtime.userprofile.Options;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandler.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandler.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandler.java Tue Nov 16 12:29:07 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.xml.p
import java.util.List;
import java.util.Stack;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.services.ServiceUtil;
import org.apache.isis.runtime.userprofile.Options;
import org.apache.isis.runtime.userprofile.PerspectiveEntry;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerTest.java Tue Nov 16 12:29:07 2010
@@ -24,6 +24,7 @@ import java.io.File;
import java.io.FilenameFilter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.xml.objectstore.internal.clock.DefaultClock;
import org.apache.isis.extensions.xml.objectstore.internal.clock.DefaultClockTest;
import org.apache.isis.extensions.xml.objectstore.internal.data.ObjectData;
@@ -31,7 +32,6 @@ import org.apache.isis.extensions.xml.ob
import org.apache.isis.extensions.xml.objectstore.internal.data.Role;
import org.apache.isis.extensions.xml.objectstore.internal.data.Team;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
import org.apache.isis.runtime.transaction.ObjectPersistenceException;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandlerTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandlerTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandlerTest.java Tue Nov 16 12:29:07 2010
@@ -33,9 +33,9 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authorization.AuthorizationManager;
-import org.apache.isis.runtime.context.IsisContextStatic;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.context.IsisContextStatic;
import org.apache.isis.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.session.IsisSessionFactory;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java Tue Nov 16 12:29:07 2010
@@ -30,6 +30,8 @@ import java.util.List;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.remoting.client.authentication.AuthenticationManagerProxy;
import org.apache.isis.remoting.client.authorization.AuthorizationManagerProxy;
import org.apache.isis.remoting.client.facetdecorator.ProxyFacetDecorator;
@@ -42,8 +44,6 @@ import org.apache.isis.remoting.marshall
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
import org.apache.isis.remoting.transport.Transport;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authorization.AuthorizationManager;
import org.apache.isis.runtime.persistence.PersistenceMechanismInstallerAbstract;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/AuthenticationManagerProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/AuthenticationManagerProxy.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/AuthenticationManagerProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/AuthenticationManagerProxy.java Tue Nov 16 12:29:07 2010
@@ -22,10 +22,10 @@ package org.apache.isis.remoting.client.
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
import org.apache.isis.remoting.exchange.CloseSessionRequest;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandard;
public class AuthenticationManagerProxy extends AuthenticationManagerStandard {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/ProxyAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/ProxyAuthenticator.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/ProxyAuthenticator.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/ProxyAuthenticator.java Tue Nov 16 12:29:07 2010
@@ -28,15 +28,15 @@ import org.apache.isis.core.commons.ensu
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.runtime.authentication.standard.PasswordRequestAuthenticatorAbstract;
+import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
import org.apache.isis.remoting.exchange.OpenSessionRequest;
import org.apache.isis.remoting.exchange.OpenSessionResponse;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtime.authentication.standard.AuthenticatorAbstract;
-import org.apache.isis.runtime.authentication.standard.PasswordRequestAuthenticatorAbstract;
-import org.apache.isis.runtime.authentication.standard.SimpleSession;
public final class ProxyAuthenticator extends PasswordRequestAuthenticatorAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authorization/AuthorizationManagerProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authorization/AuthorizationManagerProxy.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authorization/AuthorizationManagerProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authorization/AuthorizationManagerProxy.java Tue Nov 16 12:29:07 2010
@@ -27,13 +27,13 @@ import org.apache.isis.applib.Identifier
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.authorization.AuthorizationManagerAbstract;
import org.apache.isis.remoting.data.common.IdentityData;
import org.apache.isis.remoting.exchange.AuthorizationRequestUsability;
import org.apache.isis.remoting.exchange.AuthorizationRequestVisibility;
import org.apache.isis.remoting.exchange.AuthorizationResponse;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authorization.AuthorizationManagerAbstract;
public class AuthorizationManagerProxy extends AuthorizationManagerAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java Tue Nov 16 12:29:07 2010
@@ -34,6 +34,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetAbstract;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.common.NullData;
import org.apache.isis.remoting.data.common.ObjectData;
@@ -43,7 +44,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.KnownObjectsRequest;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java Tue Nov 16 12:29:07 2010
@@ -26,13 +26,13 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.facets.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.core.progmodel.facets.collections.modify.CollectionAddToFacetAbstract;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.common.IdentityData;
import org.apache.isis.remoting.data.common.ObjectData;
import org.apache.isis.remoting.exchange.SetAssociationRequest;
import org.apache.isis.remoting.exchange.SetAssociationResponse;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java Tue Nov 16 12:29:07 2010
@@ -26,13 +26,13 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.facets.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
import org.apache.isis.core.progmodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.common.IdentityData;
import org.apache.isis.remoting.data.common.ObjectData;
import org.apache.isis.remoting.exchange.ClearAssociationRequest;
import org.apache.isis.remoting.exchange.ClearAssociationResponse;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java Tue Nov 16 12:29:07 2010
@@ -25,13 +25,13 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.facets.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
import org.apache.isis.core.progmodel.facets.properties.modify.PropertyClearFacetAbstract;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.common.IdentityData;
import org.apache.isis.remoting.data.common.ObjectData;
import org.apache.isis.remoting.exchange.ClearAssociationRequest;
import org.apache.isis.remoting.exchange.ClearAssociationResponse;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java Tue Nov 16 12:29:07 2010
@@ -26,6 +26,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetAbstract;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.common.EncodableObjectData;
import org.apache.isis.remoting.data.common.IdentityData;
import org.apache.isis.remoting.data.common.ObjectData;
@@ -35,7 +36,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.SetValueResponse;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java Tue Nov 16 12:29:07 2010
@@ -22,7 +22,7 @@ package org.apache.isis.remoting.client.
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java Tue Nov 16 12:29:07 2010
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.ad
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.core.runtime.context.IsisContext;
import org.apache.isis.remoting.client.transaction.ClientSideTransaction;
import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
import org.apache.isis.remoting.data.common.ObjectData;
@@ -34,7 +35,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.KnownObjectsRequest;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.isis.runtime.persistence.PersistenceSessionTransactionManagement;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerProxy;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java Tue Nov 16 12:29:07 2010
@@ -37,6 +37,7 @@ import org.apache.isis.core.metamodel.se
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.common.IdentityData;
import org.apache.isis.remoting.data.common.ObjectData;
@@ -55,7 +56,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.ResolveObjectResponse;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionAbstract;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/ServerFacadeLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/ServerFacadeLogger.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/ServerFacadeLogger.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/ServerFacadeLogger.java Tue Nov 16 12:29:07 2010
@@ -30,6 +30,7 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.common.CollectionData;
@@ -73,7 +74,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.SetValueRequest;
import org.apache.isis.remoting.exchange.SetValueResponse;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.logging.Logger;
import com.google.inject.internal.Lists;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java Tue Nov 16 12:29:07 2010
@@ -49,6 +49,9 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.internal.ObjectActionImpl;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.IsisRemoteException;
import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
import org.apache.isis.remoting.data.Data;
@@ -94,9 +97,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.SetValueResponse;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceConstants;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.query.PersistenceQuery;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectDeserializer.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectDeserializer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectDeserializer.java Tue Nov 16 12:29:07 2010
@@ -36,6 +36,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.IsisRemoteException;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.common.CollectionData;
@@ -45,7 +46,6 @@ import org.apache.isis.remoting.data.com
import org.apache.isis.remoting.data.common.ObjectData;
import org.apache.isis.remoting.data.common.ReferenceData;
import org.apache.isis.remoting.exchange.KnownObjectsRequest;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionHydrator;
import org.apache.isis.runtime.persistence.PersistorUtil;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectEncoderDecoderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectEncoderDecoderDefault.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectEncoderDecoderDefault.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectEncoderDecoderDefault.java Tue Nov 16 12:29:07 2010
@@ -35,6 +35,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.IsisRemoteException;
import org.apache.isis.remoting.client.facets.ActionInvocationFacetWrapProxy;
import org.apache.isis.remoting.client.facets.PropertySetterFacetWrapProxy;
@@ -68,7 +69,6 @@ import org.apache.isis.remoting.facade.i
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
import org.apache.isis.remoting.protocol.PersistenceQueryEncoder;
import org.apache.isis.remoting.protocol.ProtocolConstants;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistorUtil;
import org.apache.isis.runtime.persistence.query.PersistenceQuery;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java Tue Nov 16 12:29:07 2010
@@ -23,13 +23,13 @@ package org.apache.isis.remoting.protoco
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.common.ObjectData;
import org.apache.isis.remoting.data.query.PersistenceQueryData;
import org.apache.isis.remoting.exchange.KnownObjectsRequest;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
import org.apache.isis.remoting.protocol.PersistenceQueryEncoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.query.PersistenceQuery;
public abstract class PersistenceQueryEncoderAbstract implements PersistenceQueryEncoder {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java Tue Nov 16 12:29:07 2010
@@ -27,11 +27,11 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.exchange.OpenSessionRequest;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.exchange.ResponseEnvelope;
import org.apache.isis.remoting.server.ServerConnection;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.system.internal.monitor.Monitor;
import org.apache.log4j.Logger;
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -35,6 +35,7 @@ import org.apache.isis.core.metamodel.se
import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.client.persistence.ClientSideTransactionManager;
import org.apache.isis.remoting.client.persistence.PersistenceSessionProxy;
import org.apache.isis.remoting.data.Data;
@@ -56,7 +57,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.ResolveObjectRequest;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
import org.apache.isis.runtime.persistence.adapterfactory.pojo.PojoAdapterFactory;
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -30,6 +30,7 @@ import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.DummyNullValue;
import org.apache.isis.remoting.data.DummyReferenceData;
@@ -39,7 +40,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.TestProxySystem;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Level;
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -29,6 +29,8 @@ import org.apache.isis.core.metamodel.ad
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.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.DummyReferenceData;
import org.apache.isis.remoting.data.common.ObjectData;
import org.apache.isis.remoting.exchange.ClearAssociationRequest;
@@ -37,8 +39,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.SetAssociationResponse;
import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
import org.apache.isis.runtime.testsystem.TestProxyAssociation;
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -28,6 +28,8 @@ import org.apache.isis.core.metamodel.ad
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.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
import org.apache.isis.remoting.data.DummyIdentityData;
import org.apache.isis.remoting.data.DummyObjectData;
@@ -38,8 +40,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.KnownObjectsRequest;
import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.isis.runtime.testsystem.TestProxyAdapter;
import org.apache.isis.runtime.testsystem.TestProxySession;
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -31,6 +31,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.DummyEncodeableObjectData;
import org.apache.isis.remoting.data.DummyReferenceData;
import org.apache.isis.remoting.data.common.ObjectData;
@@ -41,8 +43,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.facade.ServerFacade;
import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
import org.apache.isis.runtime.testsystem.TestProxyAssociation;
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -30,6 +30,8 @@ import org.apache.isis.core.metamodel.ad
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.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.data.DummyIdentityData;
import org.apache.isis.remoting.data.DummyObjectData;
import org.apache.isis.remoting.data.DummyReferenceData;
@@ -39,8 +41,6 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.TestProxyAdapter;
import org.apache.isis.runtime.testsystem.TestProxySession;
import org.apache.isis.runtime.testsystem.TestProxySystem;
Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewerInstaller.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewerInstaller.java Tue Nov 16 12:29:07 2010
@@ -24,8 +24,8 @@ import java.util.List;
import org.apache.isis.alternatives.remoting.transport.sockets.server.SocketsViewerAbstract;
import org.apache.isis.alternatives.remoting.transport.sockets.server.SocketsViewerInstallerAbstract;
+import org.apache.isis.core.runtime.Isis;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.Isis;
import org.apache.isis.runtime.viewer.IsisViewer;
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.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/EncodingOverHttpRemotingViewerInstaller.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.java Tue Nov 16 12:29:07 2010
@@ -22,7 +22,7 @@ package org.apache.isis.alternatives.rem
import java.util.List;
-import org.apache.isis.runtime.Isis;
+import org.apache.isis.core.runtime.Isis;
import org.apache.isis.runtime.viewer.IsisViewer;
import org.apache.isis.runtime.viewer.IsisViewerInstallerAbstract;
import org.apache.isis.runtime.web.EmbeddedWebViewer;
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.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/EncodingOverSocketsViewerInstaller.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java Tue Nov 16 12:29:07 2010
@@ -22,8 +22,8 @@ package org.apache.isis.alternatives.rem
import java.util.List;
+import org.apache.isis.core.runtime.Isis;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.Isis;
import org.apache.isis.runtime.viewer.IsisViewer;
/**
Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.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/SerializingOverSocketsViewerInstaller.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java Tue Nov 16 12:29:07 2010
@@ -22,8 +22,8 @@ package org.apache.isis.alternatives.rem
import java.util.List;
+import org.apache.isis.core.runtime.Isis;
import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.Isis;
import org.apache.isis.runtime.viewer.IsisViewer;
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -30,12 +30,12 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.remoting.exchange.OpenSessionRequest;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.exchange.ResponseEnvelope;
import org.apache.isis.remoting.server.ServerConnection;
import org.apache.isis.remoting.transport.ServerConnectionHandler;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.system.internal.monitor.Monitor;
public class Worker implements Runnable {
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.authentication.standard.file;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
-import org.apache.isis.runtime.authentication.standard.Authenticator;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
+import org.apache.isis.core.runtime.authentication.standard.Authenticator;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -32,9 +32,9 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.commons.io.IoUtils;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
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;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.standard.PasswordRequestAuthenticatorAbstract;
import com.google.inject.Inject;
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.authorization.standard.file;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
-import org.apache.isis.runtime.authorization.AuthorizationManagerInstaller;
-import org.apache.isis.runtime.authorization.standard.AuthorizationConstants;
+import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
+import org.apache.isis.core.runtime.authorization.standard.AuthorizationConstants;
public final class FileAuthorizationConstants {
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.authorization.standard.file;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
-import org.apache.isis.runtime.authorization.standard.Authorizor;
+import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
+import org.apache.isis.core.runtime.authorization.standard.Authorizor;
public class FileAuthorizationManagerInstaller extends AuthorizationManagerStandardInstallerAbstract {
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -43,7 +43,7 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.commons.resource.ResourceStreamSource;
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;
+import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
public class FileAuthorizor extends 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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -21,7 +21,7 @@
package org.apache.isis.runtime.authentication.standard.ldap;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
-import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
+import org.apache.isis.core.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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.authentication.standard.ldap;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authentication.standard.Authenticator;
-import org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
+import org.apache.isis.core.runtime.authentication.standard.Authenticator;
public class LdapAuthenticationManagerInstaller extends 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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -37,9 +37,9 @@ 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.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;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
public class LdapAuthenticator extends 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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -21,9 +21,9 @@
package org.apache.isis.runtime.authorization.standard.ldap;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
+import org.apache.isis.core.runtime.authorization.standard.AuthorizationConstants;
import org.apache.isis.runtime.authentication.standard.ldap.LdapAuthenticationConstants;
-import org.apache.isis.runtime.authorization.AuthorizationManagerInstaller;
-import org.apache.isis.runtime.authorization.standard.AuthorizationConstants;
public final class LdapAuthorizationConstants {
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.authorization.standard.ldap;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
-import org.apache.isis.runtime.authorization.standard.Authorizor;
+import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
+import org.apache.isis.core.runtime.authorization.standard.Authorizor;
public class LdapAuthorizationManagerInstaller extends
AuthorizationManagerStandardInstallerAbstract {
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=1035613&r1=1035612&r2=1035613&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 Tue Nov 16 12:29:07 2010
@@ -41,7 +41,7 @@ import org.apache.log4j.Logger;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authorization.standard.AuthorizorAbstract;
+import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
public class LdapAuthorizor extends AuthorizorAbstract {
Modified: incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticatorTester.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticatorTester.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticatorTester.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticatorTester.java Tue Nov 16 12:29:07 2010
@@ -20,8 +20,8 @@
package org.apache.isis.runtime.authentication.standard.ldap;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.context.IsisContext;
public class LdapAuthenticatorTester {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/Isis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/Isis.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/Isis.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/Isis.java Tue Nov 16 12:29:07 2010
@@ -23,6 +23,6 @@ package org.apache.isis;
public class Isis {
public static void main(final String[] args) {
- org.apache.isis.runtime.Isis.main(args);
+ org.apache.isis.core.runtime.Isis.main(args);
}
}
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/Isis.java (from r1035569, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/Isis.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/Isis.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/Isis.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/Isis.java&r1=1035569&r2=1035613&rev=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/Isis.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/Isis.java Tue Nov 16 12:29:07 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime;
+package org.apache.isis.core.runtime;
import org.apache.isis.runtime.options.standard.OptionHandlerDeploymentTypeIsis;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeBootstrapper.java (from r1035569, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/RuntimeBootstrapper.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeBootstrapper.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeBootstrapper.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/RuntimeBootstrapper.java&r1=1035569&r2=1035613&rev=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/RuntimeBootstrapper.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeBootstrapper.java Tue Nov 16 12:29:07 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime;
+package org.apache.isis.core.runtime;
import java.util.ArrayList;
import java.util.List;
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.isis.core.commons.lang.Threads;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.runtime.installers.InstallerLookup;
import org.apache.isis.runtime.runner.IsisBootstrapper;
import org.apache.isis.runtime.runner.IsisModule.ViewerList;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java?rev=1035613&r1=1035569&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java Tue Nov 16 12:29:07 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.about;
+package org.apache.isis.core.runtime.about;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java?rev=1035613&r1=1035569&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java Tue Nov 16 12:29:07 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.about;
+package org.apache.isis.core.runtime.about;
public interface ComponentDetails {
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java (from r1035569, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManager.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManager.java&r1=1035569&r2=1035613&rev=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManager.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java Tue Nov 16 12:29:07 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authentication;
+package org.apache.isis.core.runtime.authentication;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerInstaller.java (from r1035569, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManagerInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerInstaller.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerInstaller.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManagerInstaller.java&r1=1035569&r2=1035613&rev=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerInstaller.java Tue Nov 16 12:29:07 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authentication;
+package org.apache.isis.core.runtime.authentication;
import org.apache.isis.core.commons.components.Installer;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequest.java (from r1035569, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationRequest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequest.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequest.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationRequest.java&r1=1035569&r2=1035613&rev=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationRequest.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequest.java Tue Nov 16 12:29:07 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authentication;
+package org.apache.isis.core.runtime.authentication;
import java.util.List;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestAbstract.java (from r1035569, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationRequestAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestAbstract.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestAbstract.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationRequestAbstract.java&r1=1035569&r2=1035613&rev=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationRequestAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestAbstract.java Tue Nov 16 12:29:07 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authentication;
+package org.apache.isis.core.runtime.authentication;
import java.util.ArrayList;
import java.util.Collections;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestPassword.java (from r1035569, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationRequestPassword.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestPassword.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestPassword.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationRequestPassword.java&r1=1035569&r2=1035613&rev=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/AuthenticationRequestPassword.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationRequestPassword.java Tue Nov 16 12:29:07 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authentication;
+package org.apache.isis.core.runtime.authentication;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/NoAuthenticatorException.java (from r1035569, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/NoAuthenticatorException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/NoAuthenticatorException.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/NoAuthenticatorException.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/NoAuthenticatorException.java&r1=1035569&r2=1035613&rev=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/NoAuthenticatorException.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/NoAuthenticatorException.java Tue Nov 16 12:29:07 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authentication;
+package org.apache.isis.core.runtime.authentication;
import org.apache.isis.core.commons.exceptions.IsisException;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/package-info.java (from r1035569, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/package-info.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/package-info.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/package-info.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/package-info.java&r1=1035569&r2=1035613&rev=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/package-info.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/package-info.java Tue Nov 16 12:29:07 2010
@@ -32,4 +32,4 @@
* authentication implementation directly.</li>
* </ul>
*/
-package org.apache.isis.runtime.authentication;
\ No newline at end of file
+package org.apache.isis.core.runtime.authentication;
\ No newline at end of file