Return-Path: Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: (qmail 45594 invoked from network); 8 Jan 2011 22:55:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Jan 2011 22:55:02 -0000 Received: (qmail 45851 invoked by uid 500); 8 Jan 2011 22:55:02 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 45834 invoked by uid 500); 8 Jan 2011 22:55:02 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 45824 invoked by uid 99); 8 Jan 2011 22:55:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Jan 2011 22:55:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Jan 2011 22:54:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B09B423889B3; Sat, 8 Jan 2011 22:54:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1056832 [2/17] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/ alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/ alternati... Date: Sat, 08 Jan 2011 22:54:01 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110108225429.B09B423889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/JavassistClassSubstitutor.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/JavassistClassSubstitutor.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/JavassistClassSubstitutor.java (original) +++ incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/JavassistClassSubstitutor.java Sat Jan 8 22:53:36 2011 @@ -21,7 +21,7 @@ package org.apache.isis.alternatives.bytecode.javassist.classsubstitutor; import org.apache.isis.alternatives.bytecode.javassist.objectfactory.internal.JavassistEnhanced; -import org.apache.isis.core.commons.lang.ClassUtil; +import org.apache.isis.core.commons.lang.JavaClassUtils; import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract; @@ -38,7 +38,7 @@ public class JavassistClassSubstitutor e */ @Override public Class getClass(Class cls) { - if (ClassUtil.directlyImplements(cls, JavassistEnhanced.class)) { + if (JavaClassUtils.directlyImplements(cls, JavassistEnhanced.class)) { return getClass(cls.getSuperclass()); } return super.getClass(cls); Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContext.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContext.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContext.java (original) +++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContext.java Sat Jan 8 22:53:36 2011 @@ -24,7 +24,7 @@ import java.util.List; import org.apache.isis.alternatives.embedded.internal.PersistenceState; import org.apache.isis.applib.query.Query; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; +import org.apache.isis.core.commons.authentication.AuthenticationSession; public interface EmbeddedContext { Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContextNoop.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContextNoop.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContextNoop.java (original) +++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContextNoop.java Sat Jan 8 22:53:36 2011 @@ -24,7 +24,7 @@ import java.util.List; import org.apache.isis.alternatives.embedded.internal.PersistenceState; import org.apache.isis.applib.query.Query; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; +import org.apache.isis.core.commons.authentication.AuthenticationSession; public class EmbeddedContextNoop implements EmbeddedContext { Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java (original) +++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java Sat Jan 8 22:53:36 2011 @@ -35,9 +35,9 @@ import java.util.TreeSet; import org.apache.isis.alternatives.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity; import org.apache.isis.alternatives.embedded.internal.RuntimeContextForEmbeddedMetaModel; import org.apache.isis.core.commons.components.ApplicationScopedComponent; +import org.apache.isis.core.commons.config.IsisConfiguration; +import org.apache.isis.core.commons.config.IsisConfigurationDefault; import org.apache.isis.core.commons.exceptions.IsisException; -import org.apache.isis.core.metamodel.config.IsisConfiguration; -import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration; import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator; import org.apache.isis.core.metamodel.layout.MemberLayoutArranger; import org.apache.isis.core.metamodel.layout.dflt.MemberLayoutArrangerDefault; @@ -98,7 +98,7 @@ public class IsisMetaModel implements Ap final Class... serviceTypes) { this.serviceTypes.addAll(Arrays.asList(serviceTypes)); - setConfiguration(new PropertiesConfiguration()); + setConfiguration(new IsisConfigurationDefault()); setClassSubstitutor(new ClassSubstitutorIdentity()); setCollectionTypeRegistry(new CollectionTypeRegistryDefault()); setSpecificationTraverser(new SpecificationTraverserDefault()); Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java (original) +++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java Sat Jan 8 22:53:36 2011 @@ -26,6 +26,9 @@ import java.util.List; import org.apache.isis.alternatives.embedded.EmbeddedContext; import org.apache.isis.applib.query.Query; +import org.apache.isis.core.commons.authentication.AuthenticationSession; +import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider; +import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAbstract; import org.apache.isis.core.commons.components.ApplicationScopedComponent; import org.apache.isis.core.metamodel.adapter.DomainObjectServices; import org.apache.isis.core.metamodel.adapter.DomainObjectServicesAbstract; @@ -40,9 +43,6 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.adapter.ServicesProviderAbstract; import org.apache.isis.core.metamodel.adapter.map.AdapterMap; import org.apache.isis.core.metamodel.adapter.map.AdapterMapAbstract; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; -import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider; -import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProviderAbstract; import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder; import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector; import org.apache.isis.core.metamodel.runtimecontext.DependencyInjectorAbstract; Modified: incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenEmbeddedViewerAndPersistentDomainObject.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenEmbeddedViewerAndPersistentDomainObject.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenEmbeddedViewerAndPersistentDomainObject.java (original) +++ incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenEmbeddedViewerAndPersistentDomainObject.java Sat Jan 8 22:53:36 2011 @@ -42,7 +42,7 @@ import org.apache.isis.alternatives.embe import org.apache.isis.alternatives.embedded.dom.employee.Employee; import org.apache.isis.alternatives.embedded.dom.employee.EmployeeRepositoryImpl; import org.apache.isis.alternatives.embedded.internal.PersistenceState; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; +import org.apache.isis.core.commons.authentication.AuthenticationSession; @RunWith(JMock.class) Modified: incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenInitialize.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenInitialize.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenInitialize.java (original) +++ incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenInitialize.java Sat Jan 8 22:53:36 2011 @@ -32,7 +32,7 @@ import org.apache.isis.alternatives.embe import org.apache.isis.alternatives.embedded.IsisMetaModel; import org.apache.isis.alternatives.embedded.dom.claim.ClaimRepositoryImpl; import org.apache.isis.alternatives.embedded.dom.employee.EmployeeRepositoryImpl; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator; import org.apache.isis.core.metamodel.progmodel.ProgrammingModel; import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor; Modified: incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenShutdown.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenShutdown.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenShutdown.java (original) +++ incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenShutdown.java Sat Jan 8 22:53:36 2011 @@ -32,7 +32,7 @@ import org.apache.isis.alternatives.embe import org.apache.isis.alternatives.embedded.IsisMetaModel; import org.apache.isis.alternatives.embedded.dom.claim.ClaimRepositoryImpl; import org.apache.isis.alternatives.embedded.dom.employee.EmployeeRepositoryImpl; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator; import org.apache.isis.core.metamodel.progmodel.ProgrammingModel; import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor; Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/NoSqlPersistorMechanismInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/NoSqlPersistorMechanismInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/NoSqlPersistorMechanismInstaller.java (original) +++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/NoSqlPersistorMechanismInstaller.java Sat Jan 8 22:53:36 2011 @@ -20,7 +20,7 @@ package org.apache.isis.alternatives.objectstore.nosql; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory; import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating; import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory; Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/file/FileServerPersistorMechanismInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/file/FileServerPersistorMechanismInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/file/FileServerPersistorMechanismInstaller.java (original) +++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/file/FileServerPersistorMechanismInstaller.java Sat Jan 8 22:53:36 2011 @@ -22,8 +22,8 @@ package org.apache.isis.alternatives.obj import org.apache.isis.alternatives.objectstore.nosql.NoSqlDataDatabase; import org.apache.isis.alternatives.objectstore.nosql.NoSqlPersistorMechanismInstaller; -import org.apache.isis.core.metamodel.config.ConfigurationConstants; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.ConfigurationConstants; +import org.apache.isis.core.commons.config.IsisConfiguration; public class FileServerPersistorMechanismInstaller extends NoSqlPersistorMechanismInstaller { Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/mongo/MongoPersistorMechanismInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/mongo/MongoPersistorMechanismInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/mongo/MongoPersistorMechanismInstaller.java (original) +++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/mongo/MongoPersistorMechanismInstaller.java Sat Jan 8 22:53:36 2011 @@ -24,8 +24,8 @@ import org.apache.isis.alternatives.obje import org.apache.isis.alternatives.objectstore.nosql.NoSqlDataDatabase; import org.apache.isis.alternatives.objectstore.nosql.NoSqlPersistorMechanismInstaller; import org.apache.isis.alternatives.objectstore.nosql.SerialKeyCreator; -import org.apache.isis.core.metamodel.config.ConfigurationConstants; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.ConfigurationConstants; +import org.apache.isis.core.commons.config.IsisConfiguration; public class MongoPersistorMechanismInstaller extends NoSqlPersistorMechanismInstaller { Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java (original) +++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java Sat Jan 8 22:53:36 2011 @@ -24,12 +24,12 @@ import java.util.Map; import com.google.common.collect.Maps; +import org.apache.isis.core.commons.config.IsisConfigurationDefault; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.ResolveState; import org.apache.isis.core.metamodel.adapter.map.AdapterMap; import org.apache.isis.core.metamodel.adapter.map.AdapterMapAbstract; import org.apache.isis.core.metamodel.adapter.oid.Oid; -import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration; import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder; import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator; import org.apache.isis.core.metamodel.layout.dflt.MemberLayoutArrangerDefault; @@ -55,7 +55,7 @@ public class TrialObjects { public TrialObjects() { - PropertiesConfiguration configuration = new PropertiesConfiguration(); + IsisConfigurationDefault configuration = new IsisConfigurationDefault(); final AdapterMapAbstract adapterMap = new AdapterMapAbstract() { Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/file/server/FileServerTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/file/server/FileServerTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/file/server/FileServerTest.java (original) +++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/file/server/FileServerTest.java Sat Jan 8 22:53:36 2011 @@ -36,7 +36,8 @@ import java.io.File; import java.io.FileWriter; import java.io.InputStream; -import org.apache.isis.core.commons.io.IoUtils; +import org.apache.isis.core.commons.lang.IoUtils; + import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -101,7 +102,7 @@ public class FileServerTest { assertFalse(file2.exists()); InputStream in = - IoUtils.asInputStream("W\nIorg.domain.Class 1025 null 1 \n{data1}\n\nIorg.domain.Class 1026 null 1\n{data2}\n"); + IoUtils.asUtf8ByteStream("W\nIorg.domain.Class 1025 null 1 \n{data1}\n\nIorg.domain.Class 1026 null 1\n{data2}\n"); ServerConnection connection = new ServerConnection(in, out); server.process(connection); @@ -119,7 +120,7 @@ public class FileServerTest { fileWriter.close(); ServerConnection connection = - new ServerConnection(IoUtils.asInputStream("W\nUorg.domain.Class 1026 21 22 \n{data2}\n"), out); + new ServerConnection(IoUtils.asUtf8ByteStream("W\nUorg.domain.Class 1026 21 22 \n{data2}\n"), out); server.process(connection); assertThat(out.toString(), is(equalTo(lineSeparated("ok\n")))); @@ -135,7 +136,7 @@ public class FileServerTest { fileWriter.close(); ServerConnection connection = - new ServerConnection(IoUtils.asInputStream("W\nUorg.domain.Class 1026 19 21 \n{data2}\n"), out); + new ServerConnection(IoUtils.asUtf8ByteStream("W\nUorg.domain.Class 1026 19 21 \n{data2}\n"), out); server.process(connection); assertThat(out.toString(), is(equalTo(lineSeparated("error\n{datax}\n")))); @@ -144,7 +145,7 @@ public class FileServerTest { @Test public void writeCreatesLogFile() throws Exception { ServerConnection connection = - new ServerConnection(IoUtils.asInputStream("W\nIorg.domain.Class 1025 6 7\n{data1}\n"), out); + new ServerConnection(IoUtils.asUtf8ByteStream("W\nIorg.domain.Class 1025 6 7\n{data1}\n"), out); server.process(connection); assertThat(out.toString(), is(equalTo(lineSeparated("ok\n")))); @@ -157,7 +158,7 @@ public class FileServerTest { public void readNonExistingFileThrowsException() throws Exception { File file1 = new File("target/test/org.domain.Class", "2020.data"); file1.delete(); - ServerConnection connection = new ServerConnection(IoUtils.asInputStream("Rorg.domain.Class 2020"), out); + ServerConnection connection = new ServerConnection(IoUtils.asUtf8ByteStream("Rorg.domain.Class 2020"), out); server.process(connection); String string = out.toString(); @@ -172,7 +173,7 @@ public class FileServerTest { fileWriter.write("type 1025 1\n{data1}"); fileWriter.close(); - ServerConnection connection = new ServerConnection(IoUtils.asInputStream("Rorg.domain.Class 2025"), out); + ServerConnection connection = new ServerConnection(IoUtils.asUtf8ByteStream("Rorg.domain.Class 2025"), out); server.process(connection); assertThat(out.toString(), is(equalTo(lineSeparated("ok\n{data1}\n")))); Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/ObjectMappingLookup.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/ObjectMappingLookup.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/ObjectMappingLookup.java (original) +++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/ObjectMappingLookup.java Sat Jan 8 22:53:36 2011 @@ -20,25 +20,24 @@ package org.apache.isis.alternatives.objectstore.sql; -import java.util.Enumeration; import java.util.HashMap; import java.util.Map; import org.apache.log4j.Logger; -import org.apache.isis.core.commons.debug.DebugInfo; +import org.apache.isis.core.commons.config.IsisConfiguration; +import org.apache.isis.core.commons.debug.DebuggableWithTitle; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.commons.factory.InstanceCreationException; -import org.apache.isis.core.commons.factory.InstanceFactory; +import org.apache.isis.core.commons.factory.InstanceUtil; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.runtime.context.IsisContext; import org.apache.isis.core.runtime.transaction.ObjectPersistenceException; -public class ObjectMappingLookup implements DebugInfo { +public class ObjectMappingLookup implements DebuggableWithTitle { private static final Logger LOG = Logger.getLogger(ObjectMappingLookup.class); private DatabaseConnectorPool connectionPool; private final Map mappings = new HashMap(); @@ -99,11 +98,9 @@ public class ObjectMappingLookup impleme String prefix = SqlObjectStore.BASE_NAME + ".mapper."; IsisConfiguration subset = IsisContext.getConfiguration().createSubset(prefix); - Enumeration e = subset.propertyNames(); - while (e.hasMoreElements()) { - String className = e.nextElement(); + for (String className : subset) { String value = subset.getString(className); - + if (value.startsWith("auto.")) { String propertiesBase = SqlObjectStore.BASE_NAME + ".automapper." + value.substring(5) + "."; add(className, objectMappingFactory.createMapper(className, propertiesBase, fieldMappingLookup, this)); @@ -112,9 +109,9 @@ public class ObjectMappingLookup impleme add(className, objectMappingFactory.createMapper(className, propertiesBase, fieldMappingLookup, this)); } else { LOG.debug("mapper " + className + "=" + value); - + try { - add(className, InstanceFactory.createInstance(value, ObjectMapping.class)); + add(className, InstanceUtil.createInstance(value, ObjectMapping.class)); } catch (ObjectPersistenceException ex) { throw new InstanceCreationException("Failed to set up mapper for " + className, ex); } Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/SqlOid.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/SqlOid.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/SqlOid.java (original) +++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/SqlOid.java Sat Jan 8 22:53:36 2011 @@ -22,10 +22,10 @@ package org.apache.isis.alternatives.obj import java.io.IOException; +import org.apache.isis.core.commons.encoding.DataInputExtended; +import org.apache.isis.core.commons.encoding.DataOutputExtended; import org.apache.isis.core.commons.ensure.Assert; import org.apache.isis.core.metamodel.adapter.oid.Oid; -import org.apache.isis.core.metamodel.encoding.DataInputExtended; -import org.apache.isis.core.metamodel.encoding.DataOutputExtended; public final class SqlOid implements Oid { Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/SqlPersistorInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/SqlPersistorInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/SqlPersistorInstaller.java (original) +++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/SqlPersistorInstaller.java Sat Jan 8 22:53:36 2011 @@ -23,7 +23,7 @@ package org.apache.isis.alternatives.obj import org.apache.isis.alternatives.objectstore.sql.auto.AutoMapperFactory; import org.apache.isis.alternatives.objectstore.sql.jdbc.JdbcConnectorFactory; import org.apache.isis.alternatives.objectstore.sql.jdbc.JdbcFieldMappingFactoryInstaller; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory; import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory; import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager; Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AbstractAutoMapper.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AbstractAutoMapper.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AbstractAutoMapper.java (original) +++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AbstractAutoMapper.java Sat Jan 8 22:53:36 2011 @@ -35,10 +35,10 @@ import org.apache.isis.alternatives.obje import org.apache.isis.alternatives.objectstore.sql.Sql; import org.apache.isis.alternatives.objectstore.sql.SqlObjectStoreException; import org.apache.isis.alternatives.objectstore.sql.mapping.FieldMapping; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.exceptions.NotYetImplementedException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.oid.Oid; -import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; import org.apache.isis.core.runtime.context.IsisContext; Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AutoMapper.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AutoMapper.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AutoMapper.java (original) +++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AutoMapper.java Sat Jan 8 22:53:36 2011 @@ -32,7 +32,7 @@ import org.apache.isis.alternatives.obje import org.apache.isis.alternatives.objectstore.sql.TitleMapping; import org.apache.isis.alternatives.objectstore.sql.VersionMapping; import org.apache.isis.alternatives.objectstore.sql.mapping.FieldMapping; -import org.apache.isis.core.commons.debug.DebugInfo; +import org.apache.isis.core.commons.debug.DebuggableWithTitle; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.ResolveState; @@ -47,7 +47,7 @@ import org.apache.isis.core.runtime.pers import org.apache.log4j.Logger; public class AutoMapper extends AbstractAutoMapper implements ObjectMapping, - DebugInfo { + DebuggableWithTitle { private static final Logger LOG = Logger.getLogger(AutoMapper.class); private static final int MAX_INSTANCES = 100; private final IdMapping idMapping; Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/jdbc/JdbcConnector.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/jdbc/JdbcConnector.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/jdbc/JdbcConnector.java (original) +++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/jdbc/JdbcConnector.java Sat Jan 8 22:53:36 2011 @@ -33,8 +33,8 @@ import org.apache.isis.alternatives.obje import org.apache.isis.alternatives.objectstore.sql.SqlMetaData; import org.apache.isis.alternatives.objectstore.sql.SqlObjectStore; import org.apache.isis.alternatives.objectstore.sql.SqlObjectStoreException; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.debug.DebugString; -import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.core.runtime.context.IsisContext; import org.apache.log4j.Logger; Modified: incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/common/SqlIntegrationTestCommon.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/common/SqlIntegrationTestCommon.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/common/SqlIntegrationTestCommon.java (original) +++ incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/common/SqlIntegrationTestCommon.java Sat Jan 8 22:53:36 2011 @@ -46,7 +46,8 @@ import org.apache.isis.applib.value.Pass import org.apache.isis.applib.value.Percentage; import org.apache.isis.applib.value.Time; import org.apache.isis.applib.value.TimeStamp; -import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem; +import org.apache.isis.core.commons.config.IsisConfigurationBuilderFileSystem; + import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -90,7 +91,7 @@ public abstract class SqlIntegrationTest private static SimpleClassTwo simpleClassTwoA; // private static SimpleClassTwo simpleClassTwoB; - ConfigurationBuilderFileSystem loader; + IsisConfigurationBuilderFileSystem loader; private SqlIntegrationTestSingleton getSingletonInstance() { return SqlIntegrationTestSingleton.getInstance(); Modified: incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/singleton/SqlIntegrationTestSingleton.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/singleton/SqlIntegrationTestSingleton.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/singleton/SqlIntegrationTestSingleton.java (original) +++ incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/singleton/SqlIntegrationTestSingleton.java Sat Jan 8 22:53:36 2011 @@ -38,7 +38,7 @@ import org.apache.isis.alternatives.obje import org.apache.isis.alternatives.objectstore.sql.testsystem.TestProxySystemIII; import org.apache.isis.alternatives.objectstore.sql.testsystem.dataclasses.SimpleClass; import org.apache.isis.alternatives.objectstore.sql.testsystem.dataclasses.SqlDataClass; -import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration; +import org.apache.isis.core.commons.config.IsisConfigurationDefault; /** * @author Kevin @@ -73,7 +73,7 @@ public class SqlIntegrationTestSingleton } public void initNOF(Properties properties) throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException { - PropertiesConfiguration configuration = new PropertiesConfiguration(); + IsisConfigurationDefault configuration = new IsisConfigurationDefault(); configuration.add(properties); persistorName = configuration.getString("isis.persistence"); @@ -94,8 +94,8 @@ public class SqlIntegrationTestSingleton private SqlDataClass sqlDataClass; @SuppressWarnings("unchecked") - private void resetPersistorState(PropertiesConfiguration PropertiesConfiguration) throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException{ - String jdbcClassName = PropertiesConfiguration.getString("isis.persistence.sql.jdbc.driver"); + private void resetPersistorState(IsisConfigurationDefault IsisConfigurationDefault) throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException{ + String jdbcClassName = IsisConfigurationDefault.getString("isis.persistence.sql.jdbc.driver"); if (jdbcClassName == null){ c = null; s = null; @@ -107,9 +107,9 @@ public class SqlIntegrationTestSingleton // jdbc - connect to DB and drop tables. c = DriverManager.getConnection( - PropertiesConfiguration.getString("isis.persistence.sql.jdbc.connection"), - PropertiesConfiguration.getString("isis.persistence.sql.jdbc.user"), - PropertiesConfiguration.getString("isis.persistence.sql.jdbc.password")); + IsisConfigurationDefault.getString("isis.persistence.sql.jdbc.connection"), + IsisConfigurationDefault.getString("isis.persistence.sql.jdbc.user"), + IsisConfigurationDefault.getString("isis.persistence.sql.jdbc.password")); s = c.createStatement(); dropTable("no_services"); Modified: incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/testsystem/TestProxySystemIII.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/testsystem/TestProxySystemIII.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/testsystem/TestProxySystemIII.java (original) +++ incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/testsystem/TestProxySystemIII.java Sat Jan 8 22:53:36 2011 @@ -31,7 +31,7 @@ import org.jmock.lib.legacy.ClassImposte import org.apache.isis.alternatives.objectstore.sql.SqlPersistorInstaller; import org.apache.isis.alternatives.objectstore.xml.XmlPersistenceMechanismInstaller; import org.apache.isis.applib.AbstractFactoryAndRepository; -import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration; +import org.apache.isis.core.commons.config.IsisConfigurationDefault; import org.apache.isis.core.metamodel.spec.SpecificationLoader; import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault; import org.apache.isis.core.runtime.authentication.AuthenticationManager; @@ -54,13 +54,13 @@ import org.apache.isis.defaults.progmode */ public class TestProxySystemIII { - private PropertiesConfiguration configuration; - public void setConfiguration(PropertiesConfiguration configuration) { + private IsisConfigurationDefault configuration; + public void setConfiguration(IsisConfigurationDefault configuration) { this.configuration = configuration; } - public PropertiesConfiguration getConfiguration() { + public IsisConfigurationDefault getConfiguration() { if (configuration == null){ - configuration = new PropertiesConfiguration(); + configuration = new IsisConfigurationDefault(); } return configuration; } Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java (original) +++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java Sat Jan 8 22:53:36 2011 @@ -39,6 +39,8 @@ import org.apache.isis.alternatives.obje import org.apache.isis.alternatives.objectstore.xml.internal.services.ServiceManager; import org.apache.isis.alternatives.objectstore.xml.internal.services.xml.XmlServiceManager; import org.apache.isis.alternatives.objectstore.xml.internal.version.FileVersion; +import org.apache.isis.core.commons.config.ConfigurationConstants; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.ensure.Assert; import org.apache.isis.core.commons.exceptions.IsisException; @@ -46,8 +48,6 @@ import org.apache.isis.core.commons.xml. import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.ResolveState; import org.apache.isis.core.metamodel.adapter.oid.Oid; -import org.apache.isis.core.metamodel.config.ConfigurationConstants; -import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet; import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils; import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet; Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstaller.java (original) +++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstaller.java Sat Jan 8 22:53:36 2011 @@ -22,7 +22,7 @@ package org.apache.isis.alternatives.obj import org.apache.isis.alternatives.objectstore.xml.internal.adapter.XmlAdapterManager; import org.apache.isis.alternatives.objectstore.xml.internal.clock.DefaultClock; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory; import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory; import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager; Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlFileUtil.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlFileUtil.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlFileUtil.java (original) +++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlFileUtil.java Sat Jan 8 22:53:36 2011 @@ -19,8 +19,8 @@ package org.apache.isis.alternatives.objectstore.xml.internal.data.xml; -import org.apache.isis.core.metamodel.config.ConfigurationConstants; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.ConfigurationConstants; +import org.apache.isis.core.commons.config.IsisConfiguration; public class XmlFileUtil { Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersion.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersion.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersion.java (original) +++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersion.java Sat Jan 8 22:53:36 2011 @@ -25,12 +25,12 @@ import java.io.Serializable; import java.util.Date; import org.apache.isis.alternatives.objectstore.xml.internal.clock.Clock; +import org.apache.isis.core.commons.encoding.DataInputExtended; +import org.apache.isis.core.commons.encoding.DataOutputExtended; +import org.apache.isis.core.commons.encoding.Encodable; import org.apache.isis.core.commons.lang.ToString; import org.apache.isis.core.metamodel.adapter.version.Version; import org.apache.isis.core.metamodel.adapter.version.VersionUserAndTimeAbstract; -import org.apache.isis.core.metamodel.encoding.DataInputExtended; -import org.apache.isis.core.metamodel.encoding.DataOutputExtended; -import org.apache.isis.core.metamodel.encoding.Encodable; public class FileVersion extends VersionUserAndTimeAbstract implements Encodable, Serializable { Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersionTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersionTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersionTest.java (original) +++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersionTest.java Sat Jan 8 22:53:36 2011 @@ -23,9 +23,9 @@ package org.apache.isis.alternatives.obj import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.apache.isis.core.commons.encoding.DataInputExtended; +import org.apache.isis.core.commons.encoding.DataOutputExtended; import org.apache.isis.core.metamodel.adapter.version.Version; -import org.apache.isis.core.metamodel.encoding.DataInputExtended; -import org.apache.isis.core.metamodel.encoding.DataOutputExtended; import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase; import org.jmock.Expectations; import org.jmock.Mockery; Modified: incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/XmlUserProfileStore.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/XmlUserProfileStore.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/XmlUserProfileStore.java (original) +++ incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/XmlUserProfileStore.java Sat Jan 8 22:53:36 2011 @@ -22,9 +22,9 @@ package org.apache.isis.alternatives.pro import org.apache.isis.alternatives.profilestore.xml.internal.UserProfileContentWriter; import org.apache.isis.alternatives.profilestore.xml.internal.UserProfileDataHandler; import org.apache.isis.alternatives.profilestore.xml.internal.XmlFileUtil; +import org.apache.isis.core.commons.config.ConfigurationConstants; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.xml.XmlFile; -import org.apache.isis.core.metamodel.config.ConfigurationConstants; -import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.core.runtime.userprofile.UserProfile; import org.apache.isis.core.runtime.userprofile.UserProfileStore; Modified: incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/XmlUserProfileStoreLoaderInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/XmlUserProfileStoreLoaderInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/XmlUserProfileStoreLoaderInstaller.java (original) +++ incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/XmlUserProfileStoreLoaderInstaller.java Sat Jan 8 22:53:36 2011 @@ -22,8 +22,8 @@ package org.apache.isis.alternatives.pro import java.util.List; -import org.apache.isis.core.metamodel.config.InstallerAbstract; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.InstallerAbstract; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.runtime.userprofile.UserProfileStore; import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller; Modified: incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileContentWriter.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileContentWriter.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileContentWriter.java (original) +++ incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileContentWriter.java Sat Jan 8 22:53:36 2011 @@ -26,9 +26,10 @@ import java.io.Writer; import java.util.Iterator; import org.apache.commons.lang.StringUtils; + +import org.apache.isis.core.commons.encoding.DataOutputStreamExtended; import org.apache.isis.core.commons.xml.ContentWriter; 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.core.runtime.persistence.PersistenceSession; import org.apache.isis.core.runtime.persistence.services.ServiceUtil; Modified: incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/internal/XmlFileUtil.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/internal/XmlFileUtil.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/internal/XmlFileUtil.java (original) +++ incubator/isis/trunk/alternatives/profilestore/xml/src/main/java/org/apache/isis/alternatives/profilestore/xml/internal/XmlFileUtil.java Sat Jan 8 22:53:36 2011 @@ -19,8 +19,8 @@ package org.apache.isis.alternatives.profilestore.xml.internal; -import org.apache.isis.core.metamodel.config.ConfigurationConstants; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.ConfigurationConstants; +import org.apache.isis.core.commons.config.IsisConfiguration; public class XmlFileUtil { Modified: incubator/isis/trunk/alternatives/profilestore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/profilestore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/profilestore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java (original) +++ incubator/isis/trunk/alternatives/profilestore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java Sat Jan 8 22:53:36 2011 @@ -28,7 +28,7 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration; +import org.apache.isis.core.commons.config.IsisConfigurationDefault; import org.apache.isis.core.metamodel.spec.SpecificationLoader; import org.apache.isis.core.runtime.authentication.AuthenticationManager; import org.apache.isis.core.runtime.authorization.AuthorizationManager; @@ -67,7 +67,7 @@ public class UserProfileDataHandlerTest IsisSessionFactory executionContextFactory = new IsisSessionFactoryDefault( DeploymentType.EXPLORATION, - new PropertiesConfiguration(), + new IsisConfigurationDefault(), mockery.mock(TemplateImageLoader.class), mockery.mock(SpecificationLoader.class), mockery.mock(AuthenticationManager.class), Modified: incubator/isis/trunk/alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java (original) +++ incubator/isis/trunk/alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java Sat Jan 8 22:53:36 2011 @@ -2,8 +2,8 @@ package org.apache.isis.progmodel.groovy import java.lang.reflect.Method; -import org.apache.isis.core.metamodel.config.IsisConfiguration; -import org.apache.isis.core.metamodel.config.IsisConfigurationAware; +import org.apache.isis.core.commons.config.IsisConfiguration; +import org.apache.isis.core.commons.config.IsisConfigurationAware; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facetapi.FeatureType; import org.apache.isis.core.metamodel.facetapi.MethodRemover; Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java (original) +++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java Sat Jan 8 22:53:36 2011 @@ -23,9 +23,9 @@ import java.util.List; import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.applib.events.InteractionEvent; +import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider; import org.apache.isis.core.metamodel.adapter.ObjectPersistor; import org.apache.isis.core.metamodel.adapter.map.AdapterMap; -import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider; import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault; import org.apache.isis.core.metamodel.spec.SpecificationLookup; import org.apache.isis.progmodel.wrapper.applib.WrapperFactory; Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java (original) +++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java Sat Jan 8 22:53:36 2011 @@ -32,13 +32,13 @@ import org.apache.isis.applib.events.Pro import org.apache.isis.applib.events.UsabilityEvent; import org.apache.isis.applib.events.ValidityEvent; import org.apache.isis.applib.events.VisibilityEvent; +import org.apache.isis.core.commons.authentication.AuthenticationSession; +import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider; import org.apache.isis.core.commons.lang.StringUtils; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.ObjectPersistor; import org.apache.isis.core.metamodel.adapter.map.AdapterMap; import org.apache.isis.core.metamodel.adapter.util.AdapterUtils; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; -import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider; import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod; import org.apache.isis.core.metamodel.consent.InteractionResult; import org.apache.isis.core.metamodel.interactions.ObjectTitleContext; Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java (original) +++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java Sat Jan 8 22:53:36 2011 @@ -23,9 +23,9 @@ package org.apache.isis.progmodel.wrappe import java.util.Collection; import java.util.Map; +import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider; import org.apache.isis.core.metamodel.adapter.ObjectPersistor; import org.apache.isis.core.metamodel.adapter.map.AdapterMap; -import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider; import org.apache.isis.core.metamodel.spec.SpecificationLookup; import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.isis.progmodel.wrapper.applib.WrapperFactory; Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java (original) +++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java Sat Jan 8 22:53:36 2011 @@ -42,12 +42,12 @@ import org.apache.isis.applib.events.Pro import org.apache.isis.applib.events.PropertyModifyEvent; import org.apache.isis.applib.events.PropertyUsabilityEvent; import org.apache.isis.applib.events.PropertyVisibilityEvent; +import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider; +import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware; import org.apache.isis.core.metamodel.adapter.ObjectPersistor; import org.apache.isis.core.metamodel.adapter.ObjectPersistorAware; import org.apache.isis.core.metamodel.adapter.map.AdapterMap; import org.apache.isis.core.metamodel.adapter.map.AdapterMapAware; -import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider; -import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProviderAware; import org.apache.isis.core.metamodel.spec.SpecificationLookup; import org.apache.isis.core.metamodel.spec.SpecificationLookupAware; import org.apache.isis.progmodel.wrapper.applib.WrapperFactory; Modified: incubator/isis/trunk/alternatives/remoting/common/pom.xml URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/pom.xml?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/pom.xml (original) +++ incubator/isis/trunk/alternatives/remoting/common/pom.xml Sat Jan 8 22:53:36 2011 @@ -55,11 +55,18 @@ org.apache.isis.core - metamodel + commons test-jar test + + org.apache.isis.core + metamodel + test-jar + test + + org.apache.isis.core runtime Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ProxyInstallerAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ProxyInstallerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ProxyInstallerAbstract.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ProxyInstallerAbstract.java Sat Jan 8 22:53:36 2011 @@ -39,7 +39,7 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; import org.apache.isis.alternatives.remoting.protocol.internal.ObjectEncoderDecoderDefault; import org.apache.isis.alternatives.remoting.transport.Transport; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.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; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authentication/AuthenticationManagerProxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authentication/AuthenticationManagerProxy.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authentication/AuthenticationManagerProxy.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authentication/AuthenticationManagerProxy.java Sat Jan 8 22:53:36 2011 @@ -23,8 +23,8 @@ package org.apache.isis.alternatives.rem import org.apache.isis.alternatives.remoting.common.exchange.CloseSessionRequest; import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.authentication.AuthenticationSession; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authentication/ProxyAuthenticator.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authentication/ProxyAuthenticator.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authentication/ProxyAuthenticator.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authentication/ProxyAuthenticator.java Sat Jan 8 22:53:36 2011 @@ -28,10 +28,10 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.exchange.OpenSessionResponse; import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; +import org.apache.isis.core.commons.authentication.AuthenticationSession; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.ensure.Ensure; 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; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authorization/AuthorizationManagerProxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authorization/AuthorizationManagerProxy.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authorization/AuthorizationManagerProxy.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/authorization/AuthorizationManagerProxy.java Sat Jan 8 22:53:36 2011 @@ -30,9 +30,9 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; import org.apache.isis.applib.Identifier; +import org.apache.isis.core.commons.authentication.AuthenticationSession; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; -import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.core.runtime.authorization.AuthorizationManagerAbstract; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facetdecorator/ProxyFacetDecorator.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facetdecorator/ProxyFacetDecorator.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facetdecorator/ProxyFacetDecorator.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facetdecorator/ProxyFacetDecorator.java Sat Jan 8 22:53:36 2011 @@ -27,7 +27,7 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.client.facets.PropertySetterFacetWrapProxy; import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; -import org.apache.isis.core.metamodel.config.IsisConfiguration; +import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/ActionInvocationFacetWrapProxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/ActionInvocationFacetWrapProxy.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/ActionInvocationFacetWrapProxy.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/ActionInvocationFacetWrapProxy.java Sat Jan 8 22:53:36 2011 @@ -34,10 +34,10 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; import org.apache.isis.applib.Identifier; +import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.commons.exceptions.IsisException; 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.facetapi.DecoratingFacet; import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet; import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet.Where; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/CollectionAddToFacetWrapProxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/CollectionAddToFacetWrapProxy.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/CollectionAddToFacetWrapProxy.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/CollectionAddToFacetWrapProxy.java Sat Jan 8 22:53:36 2011 @@ -26,9 +26,9 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.exchange.SetAssociationResponse; import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; +import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.facetapi.DecoratingFacet; import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet; import org.apache.isis.core.progmodel.facets.collections.modify.CollectionAddToFacetAbstract; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/CollectionRemoveFromFacetWrapProxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/CollectionRemoveFromFacetWrapProxy.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/CollectionRemoveFromFacetWrapProxy.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/CollectionRemoveFromFacetWrapProxy.java Sat Jan 8 22:53:36 2011 @@ -26,9 +26,9 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.exchange.ClearAssociationResponse; import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; +import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.facetapi.DecoratingFacet; import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet; import org.apache.isis.core.progmodel.facets.collections.modify.CollectionRemoveFromFacetAbstract; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/PropertyClearFacetWrapProxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/PropertyClearFacetWrapProxy.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/PropertyClearFacetWrapProxy.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/PropertyClearFacetWrapProxy.java Sat Jan 8 22:53:36 2011 @@ -26,8 +26,8 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.exchange.ClearAssociationResponse; import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; +import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.facetapi.DecoratingFacet; import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet; import org.apache.isis.core.progmodel.facets.properties.modify.PropertyClearFacetAbstract; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/PropertySetterFacetWrapProxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/PropertySetterFacetWrapProxy.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/PropertySetterFacetWrapProxy.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facets/PropertySetterFacetWrapProxy.java Sat Jan 8 22:53:36 2011 @@ -29,8 +29,8 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.exchange.SetValueResponse; import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; +import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.facetapi.DecoratingFacet; import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/ClientSideTransactionManager.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/ClientSideTransactionManager.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/ClientSideTransactionManager.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/ClientSideTransactionManager.java Sat Jan 8 22:53:36 2011 @@ -29,11 +29,11 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.exchange.KnownObjectsRequest; import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; +import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.ResolveState; 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.core.runtime.persistence.ConcurrencyException; import org.apache.isis.core.runtime.persistence.PersistenceSessionTransactionManagement; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/PersistenceSessionProxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/PersistenceSessionProxy.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/PersistenceSessionProxy.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/PersistenceSessionProxy.java Sat Jan 8 22:53:36 2011 @@ -43,13 +43,13 @@ import org.apache.isis.alternatives.remo import org.apache.isis.alternatives.remoting.common.exchange.ResolveObjectResponse; import org.apache.isis.alternatives.remoting.common.facade.ServerFacade; import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder; +import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.commons.components.ApplicationScopedComponent; import org.apache.isis.core.commons.components.SessionScopedComponent; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.ResolveState; import org.apache.isis.core.metamodel.adapter.oid.Oid; -import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet; import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils; import org.apache.isis.core.metamodel.services.ServicesInjector; Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/CollectionDataImpl.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/CollectionDataImpl.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/CollectionDataImpl.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/CollectionDataImpl.java Sat Jan 8 22:53:36 2011 @@ -23,12 +23,12 @@ package org.apache.isis.alternatives.rem import java.io.IOException; import java.io.Serializable; +import org.apache.isis.core.commons.encoding.DataInputExtended; +import org.apache.isis.core.commons.encoding.DataOutputExtended; +import org.apache.isis.core.commons.encoding.Encodable; import org.apache.isis.core.commons.lang.ToString; import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.core.metamodel.adapter.version.Version; -import org.apache.isis.core.metamodel.encoding.DataInputExtended; -import org.apache.isis.core.metamodel.encoding.DataOutputExtended; -import org.apache.isis.core.metamodel.encoding.Encodable; public class CollectionDataImpl implements CollectionData, Encodable, Serializable { Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/EncodableObjectDataImpl.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/EncodableObjectDataImpl.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/EncodableObjectDataImpl.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/EncodableObjectDataImpl.java Sat Jan 8 22:53:36 2011 @@ -23,10 +23,10 @@ package org.apache.isis.alternatives.rem import java.io.IOException; import java.io.Serializable; +import org.apache.isis.core.commons.encoding.DataInputExtended; +import org.apache.isis.core.commons.encoding.DataOutputExtended; +import org.apache.isis.core.commons.encoding.Encodable; import org.apache.isis.core.commons.lang.ToString; -import org.apache.isis.core.metamodel.encoding.DataInputExtended; -import org.apache.isis.core.metamodel.encoding.DataOutputExtended; -import org.apache.isis.core.metamodel.encoding.Encodable; public class EncodableObjectDataImpl implements EncodableObjectData, Encodable, Serializable { Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/IdentityDataImpl.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/IdentityDataImpl.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/IdentityDataImpl.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/IdentityDataImpl.java Sat Jan 8 22:53:36 2011 @@ -22,12 +22,12 @@ package org.apache.isis.alternatives.rem import java.io.IOException; +import org.apache.isis.core.commons.encoding.DataInputExtended; +import org.apache.isis.core.commons.encoding.DataOutputExtended; +import org.apache.isis.core.commons.encoding.Encodable; import org.apache.isis.core.commons.lang.ToString; import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.core.metamodel.adapter.version.Version; -import org.apache.isis.core.metamodel.encoding.DataInputExtended; -import org.apache.isis.core.metamodel.encoding.DataOutputExtended; -import org.apache.isis.core.metamodel.encoding.Encodable; public class IdentityDataImpl implements IdentityData, Encodable { Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/NullDataImpl.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/NullDataImpl.java?rev=1056832&r1=1056831&r2=1056832&view=diff ============================================================================== --- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/NullDataImpl.java (original) +++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/NullDataImpl.java Sat Jan 8 22:53:36 2011 @@ -23,10 +23,10 @@ package org.apache.isis.alternatives.rem import java.io.IOException; import java.io.Serializable; +import org.apache.isis.core.commons.encoding.DataInputExtended; +import org.apache.isis.core.commons.encoding.DataOutputExtended; +import org.apache.isis.core.commons.encoding.Encodable; import org.apache.isis.core.commons.lang.ToString; -import org.apache.isis.core.metamodel.encoding.DataInputExtended; -import org.apache.isis.core.metamodel.encoding.DataOutputExtended; -import org.apache.isis.core.metamodel.encoding.Encodable; public class NullDataImpl implements NullData, Encodable, Serializable {