incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1032561 [16/19] - in /incubator/isis/trunk: alternatives/bytecode/identity/src/main/java/org/apache/isis/metamodel/specloader/classsubstitutor/ alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/...
Date Mon, 08 Nov 2010 12:59:33 GMT
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java Mon Nov  8 12:58:33 2010
@@ -22,11 +22,11 @@ package org.apache.isis.runtime.authoriz
 
 import java.lang.reflect.Method;
 
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
 import org.apache.isis.runtime.authorization.AuthorizationManager;
 import org.apache.isis.runtime.context.IsisContext;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetImpl.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetImpl.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.authorization.standard;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.runtime.authorization.AuthorizationManager;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java Mon Nov  8 12:58:33 2010
@@ -26,10 +26,10 @@ import static org.apache.isis.core.commo
 
 import java.lang.reflect.Method;
 
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.metamodel.spec.JavaSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.persistence.objectfactory.ObjectChanger;
 import org.apache.isis.runtime.persistence.objectfactory.ObjectResolver;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java Mon Nov  8 12:58:33 2010
@@ -29,7 +29,7 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.ConfigurationException;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authorization.AuthorizationManager;
 import org.apache.isis.runtime.imageloader.TemplateImageLoader;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistor.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistor.java Mon Nov  8 12:58:33 2010
@@ -32,13 +32,13 @@ import java.util.Set;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.fixturesinstaller.FixtureException;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureService.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureService.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureService.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixture/ObjectFixtureService.java Mon Nov  8 12:58:33 2010
@@ -37,10 +37,10 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Persistability;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.runtime.context.IsisContext;
 
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/FixturesInstallerDelegate.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/FixturesInstallerDelegate.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/FixturesInstallerDelegate.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/fixturesinstaller/FixturesInstallerDelegate.java Mon Nov  8 12:58:33 2010
@@ -32,7 +32,7 @@ import org.apache.isis.applib.fixtures.L
 import org.apache.isis.applib.profiles.ProfileService;
 import org.apache.isis.applib.profiles.ProfileServiceAware;
 import org.apache.isis.core.commons.lang.CastUtils;
-import org.apache.isis.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetLookup.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetLookup.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/HelpFacetLookup.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.help;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.help.HelpFacetAbstract;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/StandardHelpFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/StandardHelpFacetDecorator.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/StandardHelpFacetDecorator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/StandardHelpFacetDecorator.java Mon Nov  8 12:58:33 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.help;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorAbstract;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.help.HelpFacet;
 import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.help.HelpFacet;
 
 
 public class StandardHelpFacetDecorator  extends FacetDecoratorAbstract implements HelpFacetDecorator {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpDecoratorInstaller.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpDecoratorInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/help/file/FileBasedHelpDecoratorInstaller.java Mon Nov  8 12:58:33 2010
@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.runtime.help.StandardHelpFacetDecorator;
 import org.apache.isis.runtime.installers.InstallerAbstract;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/I18nFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/I18nFacetDecorator.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/I18nFacetDecorator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/I18nFacetDecorator.java Mon Nov  8 12:58:33 2010
@@ -22,12 +22,12 @@ package org.apache.isis.runtime.i18n.res
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorAbstract;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.help.HelpFacet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
 import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.help.HelpFacet;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
 import org.apache.isis.runtime.i18n.resourcebundle.facets.DescribedAsFacetWrapI18n;
 import org.apache.isis.runtime.i18n.resourcebundle.facets.HelpFacetWrapI18n;
 import org.apache.isis.runtime.i18n.resourcebundle.facets.NamedFacetWrapI18n;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nDecoratorInstaller.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nDecoratorInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/ResourceBasedI18nDecoratorInstaller.java Mon Nov  8 12:58:33 2010
@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.runtime.installers.InstallerAbstract;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/DescribedAsFacetWrapI18n.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/DescribedAsFacetWrapI18n.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/DescribedAsFacetWrapI18n.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/DescribedAsFacetWrapI18n.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.i18n.resourcebundle.facets;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/HelpFacetWrapI18n.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/HelpFacetWrapI18n.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/HelpFacetWrapI18n.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/HelpFacetWrapI18n.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.i18n.resourcebundle.facets;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.help.HelpFacetAbstract;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/NamedFacetWrapI18n.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/NamedFacetWrapI18n.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/NamedFacetWrapI18n.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/i18n/resourcebundle/facets/NamedFacetWrapI18n.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.i18n.resourcebundle.facets;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java Mon Nov  8 12:58:33 2010
@@ -26,8 +26,8 @@ import org.apache.isis.core.commons.comp
 import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilderAware;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
-import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
+import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
 import org.apache.isis.runtime.authorization.AuthorizationManagerInstaller;
 import org.apache.isis.runtime.fixturesinstaller.FixturesInstaller;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java Mon Nov  8 12:58:33 2010
@@ -44,8 +44,8 @@ import org.apache.isis.core.commons.lang
 import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.config.NotFoundPolicy;
-import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
-import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
+import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.runtime.about.AboutIsis;
 import org.apache.isis.runtime.about.ComponentDetails;
 import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java Mon Nov  8 12:58:33 2010
@@ -32,16 +32,16 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 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.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.PersistenceSessionHydrator;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java Mon Nov  8 12:58:33 2010
@@ -28,8 +28,8 @@ import java.util.Map;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.runtime.context.IsisContext;
 
 public class StandaloneData extends Data {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerReflector.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerReflector.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerReflector.java Mon Nov  8 12:58:33 2010
@@ -28,7 +28,7 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.runtime.installers.InstallerRepository;
 import org.apache.isis.runtime.runner.BootPrinter;
 import org.apache.isis.runtime.runner.Constants;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java Mon Nov  8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.runtime.persiste
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.services.ServicesInjector;
-import org.apache.isis.metamodel.services.ServicesInjectorDefault;
-import org.apache.isis.metamodel.services.container.DomainObjectContainerDefault;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
+import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
 import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
 import org.apache.isis.runtime.persistence.adapterfactory.pojo.PojoAdapterFactory;
 import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java Mon Nov  8 12:58:33 2010
@@ -31,8 +31,8 @@ import java.util.Properties;
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.commons.factory.InstanceFactory;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.runtime.installers.InstallerAbstract;
 import org.apache.isis.runtime.installers.InstallerLookup;
 import org.apache.isis.runtime.installers.InstallerLookupAware;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSession.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSession.java Mon Nov  8 12:58:33 2010
@@ -24,9 +24,9 @@ import org.apache.isis.core.commons.comp
 import org.apache.isis.core.commons.components.Injectable;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
 import org.apache.isis.core.commons.debug.DebugInfo;
-import org.apache.isis.metamodel.services.ServicesInjector;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
 import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java Mon Nov  8 12:58:33 2010
@@ -39,17 +39,17 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ObjectList;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindAllInstances;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindByPattern;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindByTitle;
 import org.apache.isis.core.metamodel.spec.Dirtiable;
 import org.apache.isis.core.metamodel.spec.IntrospectableSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationFacets;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification.CreationMode;
-import org.apache.isis.metamodel.services.ServicesInjector;
-import org.apache.isis.metamodel.services.container.query.QueryCardinality;
-import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
-import org.apache.isis.metamodel.services.container.query.QueryFindByPattern;
-import org.apache.isis.metamodel.services.container.query.QueryFindByTitle;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerExtended;
 import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java Mon Nov  8 12:58:33 2010
@@ -24,9 +24,9 @@ import org.apache.isis.applib.query.Quer
 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.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.runtime.persistence.query.PersistenceQuery;
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactory.java Mon Nov  8 12:58:33 2010
@@ -23,8 +23,8 @@ package org.apache.isis.runtime.persiste
 import java.util.List;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
 import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
 import org.apache.isis.runtime.system.DeploymentType;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegating.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegating.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegating.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegating.java Mon Nov  8 12:58:33 2010
@@ -28,7 +28,7 @@ import java.util.List;
 
 import org.apache.isis.applib.clock.Clock;
 import org.apache.isis.applib.fixtures.FixtureClock;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.system.DeploymentType;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java Mon Nov  8 12:58:33 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.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.services.ServicesInjector;
-import org.apache.isis.metamodel.services.container.query.QueryCardinality;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.logging.Logger;
 import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapter.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapter.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapter.java Mon Nov  8 12:58:33 2010
@@ -35,11 +35,11 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Specification;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.ConcurrencyException;
 import org.apache.isis.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerDefault.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerDefault.java Mon Nov  8 12:58:33 2010
@@ -35,17 +35,17 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
+import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjectorAware;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacet;
-import org.apache.isis.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
-import org.apache.isis.metamodel.services.ServicesInjector;
-import org.apache.isis.metamodel.services.ServicesInjectorAware;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
 import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactoryAware;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java Mon Nov  8 12:58:33 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.persiste
 
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
 
 
 public final class AdapterUtils {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java Mon Nov  8 12:58:33 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.persistence.container;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java Mon Nov  8 12:58:33 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.persiste
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/internal/RuntimeContextFromSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/internal/RuntimeContextFromSession.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/internal/RuntimeContextFromSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/internal/RuntimeContextFromSession.java Mon Nov  8 12:58:33 2010
@@ -27,12 +27,12 @@ import org.apache.isis.applib.query.Quer
 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.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAbstract;
+import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.identifier.Identified;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.runtimecontext.ObjectInstantiationException;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAbstract;
-import org.apache.isis.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactory.java Mon Nov  8 12:58:33 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.persistence.objectfactory;
 
 import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
 
 
 public interface ObjectFactory extends SessionScopedComponent {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryAbstract.java Mon Nov  8 12:58:33 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.persiste
 
 import java.lang.reflect.Modifier;
 
-import org.apache.isis.metamodel.runtimecontext.ObjectInstantiationException;
-import org.apache.isis.metamodel.services.ServicesInjector;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java Mon Nov  8 12:58:33 2010
@@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.runtime.logging.Logger;
 import org.apache.isis.runtime.persistence.PersistenceMechanismInstallerAbstract;
 import org.apache.isis.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStore.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStore.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStore.java Mon Nov  8 12:58:33 2010
@@ -36,16 +36,16 @@ import org.apache.isis.core.metamodel.ad
 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.object.callbacks.LoadedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.util.CallbackUtils;
-import org.apache.isis.metamodel.facets.object.callbacks.LoadedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.LoadingCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
-import org.apache.isis.metamodel.services.ServicesInjector;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.FixturesInstalledFlag;
 import org.apache.isis.runtime.persistence.NotPersistableException;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java Mon Nov  8 12:58:33 2010
@@ -25,12 +25,12 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.util.CallbackUtils;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.PersistAlgorithmAbstract;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
 import org.apache.isis.runtime.transaction.ObjectPersistenceException;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java Mon Nov  8 12:58:33 2010
@@ -27,13 +27,13 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.util.CallbackUtils;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.PersistAlgorithmAbstract;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
 import org.apache.isis.runtime.transaction.ObjectPersistenceException;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java Mon Nov  8 12:58:33 2010
@@ -27,13 +27,13 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.util.CallbackUtils;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.PersistAlgorithmAbstract;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java Mon Nov  8 12:58:33 2010
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.en
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 import org.apache.isis.core.metamodel.encoding.Encodable;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.context.IsisContext;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java Mon Nov  8 12:58:33 2010
@@ -23,8 +23,8 @@ package org.apache.isis.runtime.persiste
 import java.io.IOException;
 
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.services.container.query.QueryBuiltInAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.services.container.query.QueryBuiltInAbstract;
 
 /**
  * Corresponds to {@link QueryBuiltInAbstract}.

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java Mon Nov  8 12:58:33 2010
@@ -22,8 +22,8 @@ package org.apache.isis.runtime.persiste
 
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindAllInstances;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByPattern.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByPattern.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByPattern.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByPattern.java Mon Nov  8 12:58:33 2010
@@ -20,9 +20,9 @@
 package org.apache.isis.runtime.persistence.query;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindByPattern;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.services.container.query.QueryFindByPattern;
 
 /**
  * Corresponds to {@link QueryFindByPattern}.

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByTitle.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByTitle.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByTitle.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByTitle.java Mon Nov  8 12:58:33 2010
@@ -22,8 +22,8 @@ package org.apache.isis.runtime.persiste
 
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindByTitle;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.services.container.query.QueryFindByTitle;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java Mon Nov  8 12:58:33 2010
@@ -30,8 +30,8 @@ import org.apache.isis.core.commons.lang
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.services.container.query.QueryCardinality;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java Mon Nov  8 12:58:33 2010
@@ -26,8 +26,8 @@ import org.apache.isis.applib.query.Quer
 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.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.services.container.query.QueryCardinality;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/RepositoryHelper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/RepositoryHelper.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/RepositoryHelper.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/RepositoryHelper.java Mon Nov  8 12:58:33 2010
@@ -24,12 +24,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindAllInstances;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.services.container.query.QueryCardinality;
-import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.query.PersistenceQuery;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/remoting/ClientConnectionInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/remoting/ClientConnectionInstaller.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/remoting/ClientConnectionInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/remoting/ClientConnectionInstaller.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.remoting;
 
-import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
 import org.apache.isis.runtime.authorization.AuthorizationManagerInstaller;
 import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/Constants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/Constants.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/Constants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/Constants.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.runner;
 
-import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
 import org.apache.isis.runtime.remoting.ClientConnectionInstaller;
 import org.apache.isis.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java Mon Nov  8 12:58:33 2010
@@ -33,7 +33,7 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.imageloader.TemplateImageLoader;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java Mon Nov  8 12:58:33 2010
@@ -25,7 +25,7 @@ import java.util.List;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+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.IsisContext;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java Mon Nov  8 12:58:33 2010
@@ -31,7 +31,7 @@ import org.apache.isis.core.commons.comp
 import org.apache.isis.core.commons.lang.JavaClassUtils;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+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.imageloader.TemplateImageLoader;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java Mon Nov  8 12:58:33 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.session;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+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.imageloader.TemplateImageLoader;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/NofMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/NofMetaModel.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/NofMetaModel.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/NofMetaModel.java Mon Nov  8 12:58:33 2010
@@ -22,8 +22,8 @@ package org.apache.isis.runtime.snapshot
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/XmlSnapshot.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/XmlSnapshot.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/XmlSnapshot.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/XmlSnapshot.java Mon Nov  8 12:58:33 2010
@@ -38,16 +38,16 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.metamodel.facets.object.value.ValueFacet;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java Mon Nov  8 12:58:33 2010
@@ -28,7 +28,7 @@ import org.apache.isis.core.commons.comp
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
 import org.apache.isis.runtime.about.AboutIsis;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authentication.standard.exploration.ExplorationSession;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java Mon Nov  8 12:58:33 2010
@@ -29,7 +29,7 @@ import static org.apache.isis.core.commo
 import java.util.List;
 
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.fixturesinstaller.FixturesInstaller;
 import org.apache.isis.runtime.imageloader.TemplateImageLoader;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java Mon Nov  8 12:58:33 2010
@@ -22,8 +22,8 @@ package org.apache.isis.runtime.system;
 
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.ObjectReflector;
-import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
 import org.apache.isis.runtime.authorization.AuthorizationManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java Mon Nov  8 12:58:33 2010
@@ -27,7 +27,7 @@ import org.apache.isis.core.commons.comp
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.i18n.resourcebundle.I18nFacetDecorator;
 import org.apache.isis.runtime.i18n.resourcebundle.ResourceBasedI18nManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java Mon Nov  8 12:58:33 2010
@@ -28,9 +28,9 @@ import static org.hamcrest.CoreMatchers.
 import java.util.List;
 
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
-import org.apache.isis.metamodel.specloader.ObjectReflector;
-import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
+import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
 import org.apache.isis.runtime.authorization.AuthorizationManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/TransactionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/TransactionUtils.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/TransactionUtils.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/TransactionUtils.java Mon Nov  8 12:58:33 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.transaction;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.runtime.transaction.facets.CollectionClearFacetWrapTransaction;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java Mon Nov  8 12:58:33 2010
@@ -22,13 +22,13 @@ package org.apache.isis.runtime.transact
 
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorAbstract;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
 
 
 public abstract class TransactionFacetDecoratorAbstract  extends FacetDecoratorAbstract implements TransactionFacetDecorator {



Mime
View raw message