incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1056832 [8/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 GMT
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java Sat Jan  8 22:53:36 2011
@@ -27,8 +27,8 @@ import java.util.List;
 
 import com.google.common.base.Function;
 
+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.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java Sat Jan  8 22:53:36 2011
@@ -16,8 +16,8 @@
  */
 package org.apache.isis.core.metamodel.spec;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.adapter.ServicesProvider;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 
 public class SpecificationContext {
     

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java Sat Jan  8 22:53:36 2011
@@ -24,10 +24,10 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 
 
-public interface SpecificationLoader extends ApplicationScopedComponent, DebugInfo, SpecificationLookup {
+public interface SpecificationLoader extends ApplicationScopedComponent, DebuggableWithTitle, SpecificationLookup {
 
     Collection<ObjectSpecification> allSpecifications();
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java Sat Jan  8 22:53:36 2011
@@ -22,9 +22,9 @@ package org.apache.isis.core.metamodel.s
 
 import java.util.List;
 
-import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.applib.filter.Filter;
+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.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.interactions.AccessContext;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java Sat Jan  8 22:53:36 2011
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.spec.feature;
 
+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.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.interactions.ActionArgumentContext;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java Sat Jan  8 22:53:36 2011
@@ -22,8 +22,8 @@ package org.apache.isis.core.metamodel.s
 
 import java.util.List;
 
-import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.core.commons.filters.Filters;
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.applib.filter.Filters;
 import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java Sat Jan  8 22:53:36 2011
@@ -20,10 +20,9 @@
 
 package org.apache.isis.core.metamodel.spec.feature;
 
-import org.apache.isis.core.commons.filters.AbstractFilter;
-import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.applib.filter.Filter;
+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.consent.Consent;
 
 
@@ -34,7 +33,7 @@ public class ObjectAssociationFilters {
     /**
      * Filters only fields that are for properties (ie 1:1 associations)
      */
-    public final static Filter<ObjectAssociation> PROPERTIES = new AbstractFilter<ObjectAssociation>() {
+    public final static Filter<ObjectAssociation> PROPERTIES = new Filter<ObjectAssociation>() {
         @Override
         public boolean accept(final ObjectAssociation association) {
             return association.isOneToOneAssociation();
@@ -44,7 +43,7 @@ public class ObjectAssociationFilters {
     /**
      * Returns all fields (that is, filters out nothing).
      */
-    public final static Filter<ObjectAssociation> ALL = new AbstractFilter<ObjectAssociation>() {
+    public final static Filter<ObjectAssociation> ALL = new Filter<ObjectAssociation>() {
         @Override
         public boolean accept(final ObjectAssociation property) {
             return true;
@@ -54,7 +53,7 @@ public class ObjectAssociationFilters {
     /**
      * Filters only fields that are for collections (ie 1:m associations)
      */
-    public final static Filter<ObjectAssociation> COLLECTIONS = new AbstractFilter<ObjectAssociation>() {
+    public final static Filter<ObjectAssociation> COLLECTIONS = new Filter<ObjectAssociation>() {
         @Override
         public boolean accept(final ObjectAssociation property) {
             return property.isOneToManyAssociation();
@@ -65,7 +64,7 @@ public class ObjectAssociationFilters {
      * Filters only properties that are visible statically, ie have not been unconditionally hidden at compile time.  Note this list will include 
      * properties marked as hidden once persisted and until persisted, but not those marked hidden always.  
      */
-    public static final Filter<ObjectAssociation> STATICALLY_VISIBLE_ASSOCIATIONS = new AbstractFilter<ObjectAssociation>() {
+    public static final Filter<ObjectAssociation> STATICALLY_VISIBLE_ASSOCIATIONS = new Filter<ObjectAssociation>() {
         @Override
         public boolean accept(final ObjectAssociation property) {
             return !property.isAlwaysHidden();
@@ -76,7 +75,7 @@ public class ObjectAssociationFilters {
      * Filters only properties that are visible statically, ie have not been hidden at compile time.
      */
     public static Filter<ObjectAssociation> dynamicallyVisible(final AuthenticationSession session, final ObjectAdapter target) {
-        return new AbstractFilter<ObjectAssociation>() {
+        return new Filter<ObjectAssociation>() {
             @Override
             public boolean accept(final ObjectAssociation objectAssociation) {
                 final Consent visible = objectAssociation.isVisible(session, target);

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java Sat Jan  8 22:53:36 2011
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.spec.feature;
 
+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.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java Sat Jan  8 22:53:36 2011
@@ -16,9 +16,9 @@
  */
 package org.apache.isis.core.metamodel.spec.feature;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 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;
 
 public class ObjectMemberContext {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectParameterFilters.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectParameterFilters.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectParameterFilters.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectParameterFilters.java Sat Jan  8 22:53:36 2011
@@ -20,8 +20,7 @@
 
 package org.apache.isis.core.metamodel.spec.feature;
 
-import org.apache.isis.core.commons.filters.AbstractFilter;
-import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.applib.filter.Filter;
 
 
 public class ObjectParameterFilters {
@@ -29,7 +28,7 @@ public class ObjectParameterFilters {
     /**
      * Filters only parameters that are for objects (ie 1:1 associations)
      */
-    public static final Filter<ObjectActionParameter> PARAMETER_ASSOCIATIONS = new AbstractFilter<ObjectActionParameter>() {
+    public static final Filter<ObjectActionParameter> PARAMETER_ASSOCIATIONS = new Filter<ObjectActionParameter>() {
         @Override
         public boolean accept(final ObjectActionParameter parameter) {
             return parameter.getSpecification().isNotCollection();

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java Sat Jan  8 22:53:36 2011
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.spec.feature;
 
+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.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.interactions.AccessContext;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java Sat Jan  8 22:53:36 2011
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.spec.feature;
 
+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.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.interactions.AccessContext;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java Sat Jan  8 22:53:36 2011
@@ -34,7 +34,9 @@ import org.apache.log4j.Logger;
 
 import com.google.common.collect.Lists;
 
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
+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.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.IsisException;
@@ -42,8 +44,6 @@ import org.apache.isis.core.commons.lang
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ServicesProvider;
 import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorSet;
@@ -113,7 +113,7 @@ import org.apache.isis.core.metamodel.sp
  * <tt>IsisContext</tt>.
  */
 
-public class ObjectReflectorDefault implements ObjectReflector, DebugInfo {
+public class ObjectReflectorDefault implements ObjectReflector, DebuggableWithTitle {
 
     private final static Logger LOG = Logger.getLogger(ObjectReflectorDefault.class);
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java Sat Jan  8 22:53:36 2011
@@ -19,8 +19,8 @@
 
 package org.apache.isis.core.metamodel.specloader;
 
-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;
 import org.apache.isis.core.metamodel.facetapi.FacetFactory;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 import org.apache.isis.core.metamodel.layout.dflt.MemberLayoutArrangerDefault;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java Sat Jan  8 22:53:36 2011
@@ -32,8 +32,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.facetapi.FacetFactory;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java Sat Jan  8 22:53:36 2011
@@ -27,14 +27,14 @@ import org.apache.log4j.Logger;
 
 import com.google.common.collect.Lists;
 
+import org.apache.isis.applib.filter.Filter;
 import org.apache.isis.applib.query.QueryFindAllInstances;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
-import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ServicesProvider;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResultSet;
@@ -59,8 +59,8 @@ import org.apache.isis.core.metamodel.in
 import org.apache.isis.core.metamodel.interactions.ValidityContext;
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 import org.apache.isis.core.metamodel.spec.ActionType;
-import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.DomainModelException;
+import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Target;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java Sat Jan  8 22:53:36 2011
@@ -24,14 +24,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.filter.Filter;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.query.QueryFindAllInstances;
-import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.consent.Allow;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java Sat Jan  8 22:53:36 2011
@@ -21,13 +21,13 @@
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.commons.lang.NameUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java Sat Jan  8 22:53:36 2011
@@ -31,13 +31,13 @@ import com.google.common.collect.Lists;
 import com.google.inject.internal.Maps;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ServicesProvider;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;
@@ -75,7 +75,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.Persistability;
 import org.apache.isis.core.metamodel.spec.SpecificationContext;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification.CreationMode;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -193,6 +192,7 @@ public abstract class ObjectSpecificatio
      * <p>
      * Not API, but <tt>public</tt> so that {@link FacetedMethodsBuilder} can call it.
      */
+    @Override
     public Class<?> getCorrespondingClass() {
         return correspondingClass;
     }
@@ -639,6 +639,7 @@ public abstract class ObjectSpecificatio
     // getObjectAction, getAction, getActions
     // //////////////////////////////////////////////////////////////////////
 
+    @Override
     public List<ObjectAction> getObjectActionsAll() {
         return Collections.unmodifiableList(objectActions);
     }

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java Sat Jan  8 22:53:36 2011
@@ -20,11 +20,11 @@
 
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java Sat Jan  8 22:53:36 2011
@@ -23,11 +23,11 @@ package org.apache.isis.core.metamodel.s
 import java.util.List;
 
 import org.apache.isis.applib.query.QueryFindAllInstances;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java Sat Jan  8 22:53:36 2011
@@ -30,13 +30,13 @@ import org.apache.log4j.Logger;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.applib.filter.Filters;
 import org.apache.isis.applib.profiles.Perspective;
-import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
-import org.apache.isis.core.commons.filters.AbstractFilter;
-import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
 import org.apache.isis.core.commons.lang.ListUtils;
 import org.apache.isis.core.commons.lang.NameUtils;
@@ -80,7 +80,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationImpl;
 import org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationImpl;
 
-public class ObjectSpecificationDefault extends ObjectSpecificationAbstract implements DebugInfo, FacetHolder {
+public class ObjectSpecificationDefault extends ObjectSpecificationAbstract implements DebuggableWithTitle, FacetHolder {
 
     private final static Logger LOG = Logger.getLogger(ObjectSpecificationDefault.class);
 
@@ -475,7 +475,7 @@ public class ObjectSpecificationDefault 
     }
 
     private void cataloguePropertiesAndCollections(final Map<Method, ObjectMember> membersByMethod) {
-        Filter noop = AbstractFilter.noop(ObjectAssociation.class);
+        Filter<ObjectAssociation> noop = Filters.anyOfType(ObjectAssociation.class);
         final List<ObjectAssociation> fields = getAssociations(noop);
         for (int i = 0; i < fields.size(); i++) {
             final ObjectAssociation field = fields.get(i);

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateCouldResolveTest  {
+public class ResolveState_CouldResolveTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateCouldResolveTes
     private final boolean couldResolve;
     private final ResolveState state;
     
-    public ResolveStateCouldResolveTest(final boolean couldResolve, final ResolveState state) {
+    public ResolveState_CouldResolveTest(final boolean couldResolve, final ResolveState state) {
         this.couldResolve = couldResolve;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateGetEndStateTest  {
+public class ResolveState_GetEndStateTest  {
 
     
     @Parameters
@@ -72,7 +72,7 @@ public class ResolveStateGetEndStateTest
     private final ResolveState from;
     private final ResolveState to;
     
-    public ResolveStateGetEndStateTest(final ResolveState from, final ResolveState to) {
+    public ResolveState_GetEndStateTest(final ResolveState from, final ResolveState to) {
         this.from = from;
         this.to = to;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsDestroyedTest  {
+public class ResolveState_IsDestroyedTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateIsDestroyedTest
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateIsDestroyedTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_IsDestroyedTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsGhostTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsGhostTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsGhostTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsGhostTest  {
+public class ResolveState_IsGhostTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateIsGhostTest  {
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateIsGhostTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_IsGhostTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsNewTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsNewTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsNewTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsNewTest  {
+public class ResolveState_IsNewTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateIsNewTest  {
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateIsNewTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_IsNewTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsPartlyResolvedTest  {
+public class ResolveState_IsPartlyResolvedTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateIsPartlyResolve
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateIsPartlyResolvedTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_IsPartlyResolvedTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPersistentTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPersistentTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPersistentTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsPersistentTest  {
+public class ResolveState_IsPersistentTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateIsPersistentTes
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateIsPersistentTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_IsPersistentTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java Sat Jan  8 22:53:36 2011
@@ -47,7 +47,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsResolvableOrDeserializableTest  {
+public class ResolveState_IsResolvableOrDeserializableTest  {
 
     
     @Parameters
@@ -271,7 +271,7 @@ public class ResolveStateIsResolvableOrD
     private final ResolveState from;
     private final ResolveState to;
     
-    public ResolveStateIsResolvableOrDeserializableTest(final Boolean whetherIsResolvable, final Boolean whetherIsDeserializable, final ResolveState from, final ResolveState to) {
+    public ResolveState_IsResolvableOrDeserializableTest(final Boolean whetherIsResolvable, final Boolean whetherIsDeserializable, final ResolveState from, final ResolveState to) {
         this.whetherIsResolvable = whetherIsResolvable;
         this.whetherIsDeserializable = whetherIsDeserializable;
         this.from = from;

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvedTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvedTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsResolvedTest  {
+public class ResolveState_IsResolvedTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateIsResolvedTest 
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateIsResolvedTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_IsResolvedTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvingTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvingTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvingTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsResolvingTest  {
+public class ResolveState_IsResolvingTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateIsResolvingTest
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateIsResolvingTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_IsResolvingTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsSerializingTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsSerializingTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsSerializingTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsSerializingTest  {
+public class ResolveState_IsSerializingTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateIsSerializingTe
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateIsSerializingTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_IsSerializingTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsTransientTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsTransientTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsTransientTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsTransientTest  {
+public class ResolveState_IsTransientTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateIsTransientTest
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateIsTransientTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_IsTransientTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsValidToChangeToTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsValidToChangeToTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsValidToChangeToTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsValidToChangeToTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsValidToChangeToTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsValidToChangeToTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsValidToChangeToTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateIsValidToChangeToTest  {
+public class ResolveState_IsValidToChangeToTest  {
 
     
     @Parameters
@@ -269,7 +269,7 @@ public class ResolveStateIsValidToChange
     private final ResolveState from;
     private final ResolveState to;
     
-    public ResolveStateIsValidToChangeToTest(final boolean whetherValidToChangeTo, final ResolveState from, final ResolveState to) {
+    public ResolveState_IsValidToChangeToTest(final boolean whetherValidToChangeTo, final ResolveState from, final ResolveState to) {
         this.whetherValidToChangeTo = whetherValidToChangeTo;
         this.from = from;
         this.to = to;

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_RespondToChangesInPersistentObjectsTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_RespondToChangesInPersistentObjectsTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_RespondToChangesInPersistentObjectsTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_RespondToChangesInPersistentObjectsTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateRespondToChangesInPersistentObjectsTest  {
+public class ResolveState_RespondToChangesInPersistentObjectsTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateRespondToChange
     private final boolean whetherIs;
     private final ResolveState state;
     
-    public ResolveStateRespondToChangesInPersistentObjectsTest(final boolean whetherIs, final ResolveState state) {
+    public ResolveState_RespondToChangesInPersistentObjectsTest(final boolean whetherIs, final ResolveState state) {
         this.whetherIs = whetherIs;
         this.state = state;
     }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_SerializeFromTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateSerializeFromTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_SerializeFromTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_SerializeFromTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateSerializeFromTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateSerializeFromTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_SerializeFromTest.java Sat Jan  8 22:53:36 2011
@@ -46,7 +46,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ResolveStateSerializeFromTest  {
+public class ResolveState_SerializeFromTest  {
 
     
     @Parameters
@@ -73,7 +73,7 @@ public class ResolveStateSerializeFromTe
     private final ResolveState state;
     private final ResolveState serializeFrom;
     
-    public ResolveStateSerializeFromTest(final ResolveState state, final ResolveState serializeFrom) {
+    public ResolveState_SerializeFromTest(final ResolveState state, final ResolveState serializeFrom) {
         this.serializeFrom = serializeFrom;
         this.state = state;
     }

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java Sat Jan  8 22:53:36 2011
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
 
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 
 public abstract class DirectlyStringableOidAbstract implements DirectlyStringableOid {
 

Added: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java (added)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java Sat Jan  8 22:53:36 2011
@@ -0,0 +1,90 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+
+package org.apache.isis.core.metamodel.consent;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.interactions.InteractionAdvisorFacet;
+
+
+public class InteractionResultTest {
+
+    private InteractionResult result;
+
+    @Before
+    public void setUp() throws Exception {
+        result = new InteractionResult(null);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        result = null;
+    }
+
+    @Test
+    public void shouldHaveNullReasonWhenJustInstantiated() {
+        assertEquals(null, result.getReason());
+    }
+
+    @Test
+    public void shouldBeEmptyWhenJustInstantiated() {
+        assertFalse(result.isVetoing());
+        assertTrue(result.isNotVetoing());
+    }
+
+    @Test
+    public void shouldHaveNonNullReasonWhenAdvisedWithNonNull() {
+        result.advise("foo", InteractionAdvisorFacet.NOOP);
+        assertEquals("foo", result.getReason());
+    }
+
+    @Test
+    public void shouldConcatenateAdviseWhenAdvisedWithNonNull() {
+        result.advise("foo", InteractionAdvisorFacet.NOOP);
+        result.advise("bar", InteractionAdvisorFacet.NOOP);
+        assertEquals("foo; bar", result.getReason());
+    }
+
+    @Test
+    public void shouldNotBeEmptyWhenAdvisedWithNonNull() {
+        result.advise("foo", InteractionAdvisorFacet.NOOP);
+        assertTrue(result.isVetoing());
+        assertFalse(result.isNotVetoing());
+    }
+
+    @Test
+    public void shouldBeEmptyWhenAdvisedWithNull() {
+        result.advise(null, InteractionAdvisorFacet.NOOP);
+        assertTrue(result.isNotVetoing());
+        assertFalse(result.isVetoing());
+        assertEquals(null, result.getReason());
+    }
+
+
+}
+

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetAbstractTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetAbstractTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetAbstractTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetAbstractTest.java Sat Jan  8 22:53:36 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 import junit.framework.TestCase;
 

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java Sat Jan  8 22:53:36 2011
@@ -18,17 +18,13 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
+
 import junit.framework.TestCase;
 
-import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.core.commons.filters.Filters;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
-import org.apache.isis.core.metamodel.facetapi.FacetFilters;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.applib.filter.Filters;
 
 
 public class FacetFiltersTest extends TestCase {

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtilsTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtilsTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtilsTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtilsTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtilsTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtilsTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtilsTest.java Sat Jan  8 22:53:36 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.facets;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -36,10 +36,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.applib.filter.Filter;
 import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils;
 import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils.ImperativeFacetFlags;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 
@@ -47,6 +45,20 @@ import org.apache.isis.core.metamodel.sp
 public class ImperativeFacetUtilsTest {
 
 	
+    public static class Customer {
+
+        private String firstName;
+
+        public String getFirstName() {
+            return firstName;
+        }
+
+        public void setFirstName(String firstName) {
+            this.firstName = firstName;
+        }
+        
+    }
+
     private Mockery context = new JUnit4Mockery() {{
     	setImposteriser(ClassImposteriser.INSTANCE);
     }};

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEventTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEventTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEventTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEventTest.java Sat Jan  8 22:53:36 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.adapter;
+package org.apache.isis.core.metamodel.facets.object.callbacks;
 
 import junit.framework.TestCase;
 

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTargetTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTargetTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTargetTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTargetTest.java Sat Jan  8 22:53:36 2011
@@ -18,25 +18,22 @@
  */
 
 
-package org.apache.isis.core.metamodel.spec.feature;
-
-import org.apache.isis.core.metamodel.spec.ActionType;
+package org.apache.isis.core.metamodel.spec;
 
 import junit.framework.TestCase;
 
+import org.apache.isis.core.metamodel.spec.Target;
 
-public class ActionTargetTest extends TestCase {
 
-    public static void main(final String[] args) {
-        junit.textui.TestRunner.run(ActionTargetTest.class);
-    }
+public class ActionTargetTest extends TestCase {
 
     public void testEquals() {
-        assertTrue(ActionType.EXPLORATION.equals(ActionType.EXPLORATION));
+        assertTrue(Target.LOCAL.equals(Target.LOCAL));
     }
 
     public void testHashCode() {
-        assertEquals(ActionType.EXPLORATION.hashCode(), ActionType.EXPLORATION.hashCode());
+        assertEquals(Target.LOCAL.hashCode(), Target.LOCAL.hashCode());
     }
 
+
 }

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTypeTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTypeTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTypeTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTypeTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTypeTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTypeTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTypeTest.java Sat Jan  8 22:53:36 2011
@@ -18,25 +18,22 @@
  */
 
 
-package org.apache.isis.core.metamodel.spec.feature;
+package org.apache.isis.core.metamodel.spec;
 
 import junit.framework.TestCase;
 
-import org.apache.isis.core.metamodel.spec.Target;
+import org.apache.isis.core.metamodel.spec.ActionType;
 
 
 public class ActionTypeTest extends TestCase {
 
-    public static void main(final String[] args) {
-        junit.textui.TestRunner.run(ActionTypeTest.class);
-    }
-
     public void testEquals() {
-        assertTrue(Target.LOCAL.equals(Target.LOCAL));
+        assertTrue(ActionType.EXPLORATION.equals(ActionType.EXPLORATION));
     }
 
     public void testHashCode() {
-        assertEquals(Target.LOCAL.hashCode(), Target.LOCAL.hashCode());
+        assertEquals(ActionType.EXPLORATION.hashCode(), ActionType.EXPLORATION.hashCode());
     }
 
+
 }

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java Sat Jan  8 22:53:36 2011
@@ -29,9 +29,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.applib.filter.Filter;
+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.facets.hide.HiddenFacet;
 
 @RunWith(JMock.class)

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java Sat Jan  8 22:53:36 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.runtimecontext.spec.feature;
+package org.apache.isis.core.metamodel.specloader.specimpl;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -32,8 +32,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+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.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java Sat Jan  8 22:53:36 2011
@@ -27,12 +27,12 @@ import java.util.List;
 import com.google.common.collect.Lists;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.factory.InstanceFactory;
-import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.commons.factory.InstanceUtil;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;
@@ -288,7 +288,7 @@ public class TestProxySpecification exte
     public void markDirty(final ObjectAdapter object) {}
 
     public Object newInstance() {
-        return InstanceFactory.createInstance(name);
+        return InstanceUtil.createInstance(name);
     }
 
     @Override

Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/authentication/AuthenticationSessionUtils.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/authentication/AuthenticationSessionUtils.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/authentication/AuthenticationSessionUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionUtils.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionUtils.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/authentication/AuthenticationSessionUtils.java Sat Jan  8 22:53:36 2011
@@ -18,13 +18,15 @@
  */
 
 
-package org.apache.isis.core.metamodel.authentication;
+package org.apache.isis.core.progmodel.authentication;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.applib.security.RoleMemento;
 import org.apache.isis.applib.security.UserMemento;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+
 
 
 public final class AuthenticationSessionUtils {
@@ -32,7 +34,7 @@ public final class AuthenticationSession
     private AuthenticationSessionUtils() {}
 
     public static UserMemento createUserMemento(final AuthenticationSession session) {
-        final List<RoleMemento> roles = new ArrayList<RoleMemento>();
+        final List<RoleMemento> roles = new ArrayList();
         for (String roleName : session.getRoles()) {
 			roles.add(new RoleMemento(roleName));
         }

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/HelpFacetDecoratorUsingFilesInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/HelpFacetDecoratorUsingFilesInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/HelpFacetDecoratorUsingFilesInstaller.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/HelpFacetDecoratorUsingFilesInstaller.java Sat Jan  8 22:53:36 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.progmodel.f
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.config.InstallerAbstract;
+import org.apache.isis.core.commons.config.InstallerAbstract;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.core.progmodel.facetdecorators.help.HelpFacetDecoratorUsingHelpManager;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java Sat Jan  8 22:53:36 2011
@@ -28,7 +28,7 @@ import java.io.IOException;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.progmodel.facetdecorators.help.HelpManagerAbstract;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/I18nDecoratorUsingResourceBundleInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/I18nDecoratorUsingResourceBundleInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/I18nDecoratorUsingResourceBundleInstaller.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/I18nDecoratorUsingResourceBundleInstaller.java Sat Jan  8 22:53:36 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.progmodel.f
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.config.InstallerAbstract;
+import org.apache.isis.core.commons.config.InstallerAbstract;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.core.progmodel.facetdecorators.i18n.I18nFacetDecorator;



Mime
View raw message