svn commit: r1032543 [6/26] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassis...

[da...@apache.org]

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveState.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ResolveState.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveState.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveState.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ResolveState.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ResolveState.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveState.java Mon Nov  8 11:23:08 2010
@@ -18,28 +18,28 @@
  */
 
 
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
 
-import static org.apache.isis.metamodel.adapter.ResolveState.DeserializableFrom.DESERIALIZABLE_FROM;
-import static org.apache.isis.metamodel.adapter.ResolveState.DeserializableFrom.NOT_DESERIALIZABLE_FROM;
-import static org.apache.isis.metamodel.adapter.ResolveState.DeserializableInto.DESERIALIZABLE_INTO;
-import static org.apache.isis.metamodel.adapter.ResolveState.DeserializableInto.NOT_DESERIALIZABLE_INTO;
-import static org.apache.isis.metamodel.adapter.ResolveState.RepresentsPersistent.DOES_NOT_REPRESENT_PERSISTENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.RepresentsPersistent.REPRESENTS_PERSISTENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.RepresentsTransient.DOES_NOT_REPRESENT_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.RepresentsTransient.REPRESENTS_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.ResolvableFrom.NOT_RESOLVABLE_FROM;
-import static org.apache.isis.metamodel.adapter.ResolveState.ResolvableFrom.RESOLVABLE_FROM;
-import static org.apache.isis.metamodel.adapter.ResolveState.ResolvableInto.NOT_RESOLVABLE_INTO;
-import static org.apache.isis.metamodel.adapter.ResolveState.ResolvableInto.RESOLVABLE_INTO;
-import static org.apache.isis.metamodel.adapter.ResolveState.ResolvePotential.COULD_RESOLVE;
-import static org.apache.isis.metamodel.adapter.ResolveState.ResolvePotential.WILL_NEVER_RESOLVE;
-import static org.apache.isis.metamodel.adapter.ResolveState.Resolving.DOES_NOT_REPRESENT_RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.Resolving.REPRESENTS_RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RespondsToChanges.DOES_NOT_RESPOND_TO_CHANGES;
-import static org.apache.isis.metamodel.adapter.ResolveState.RespondsToChanges.RESPONDS_TO_CHANGES;
-import static org.apache.isis.metamodel.adapter.ResolveState.Serializing.DOES_NOT_REPRESENT_SERIALIZING;
-import static org.apache.isis.metamodel.adapter.ResolveState.Serializing.REPRESENTS_SERIALIZING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DeserializableFrom.DESERIALIZABLE_FROM;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DeserializableFrom.NOT_DESERIALIZABLE_FROM;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DeserializableInto.DESERIALIZABLE_INTO;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DeserializableInto.NOT_DESERIALIZABLE_INTO;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RepresentsPersistent.DOES_NOT_REPRESENT_PERSISTENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RepresentsPersistent.REPRESENTS_PERSISTENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RepresentsTransient.DOES_NOT_REPRESENT_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RepresentsTransient.REPRESENTS_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.ResolvableFrom.NOT_RESOLVABLE_FROM;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.ResolvableFrom.RESOLVABLE_FROM;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.ResolvableInto.NOT_RESOLVABLE_INTO;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.ResolvableInto.RESOLVABLE_INTO;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.ResolvePotential.COULD_RESOLVE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.ResolvePotential.WILL_NEVER_RESOLVE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.Resolving.DOES_NOT_REPRESENT_RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.Resolving.REPRESENTS_RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RespondsToChanges.DOES_NOT_RESPOND_TO_CHANGES;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RespondsToChanges.RESPONDS_TO_CHANGES;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.Serializing.DOES_NOT_REPRESENT_SERIALIZING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.Serializing.REPRESENTS_SERIALIZING;
 
 import java.util.Arrays;
 import java.util.HashMap;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/TextEntryParseException.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/TextEntryParseException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/TextEntryParseException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/TextEntryParseException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/TextEntryParseException.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/TextEntryParseException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/TextEntryParseException.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
 
 import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/AggregatedOid.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/AggregatedOid.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/AggregatedOid.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/AggregatedOid.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/AggregatedOid.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/AggregatedOid.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/AggregatedOid.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.oid;
+package org.apache.isis.core.metamodel.adapter.oid;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -26,8 +26,8 @@ import java.io.Serializable;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java Mon Nov  8 11:23:08 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.oid;
+package org.apache.isis.core.metamodel.adapter.oid;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 public interface Oid extends Encodable {
     

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/OidStringifier.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/stringable/OidStringifier.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/OidStringifier.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/OidStringifier.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/stringable/OidStringifier.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/stringable/OidStringifier.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/OidStringifier.java Mon Nov  8 11:23:08 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.oid.stringable;
+package org.apache.isis.core.metamodel.adapter.oid.stringable;
 
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
 
 public interface OidStringifier {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOid.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOid.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOid.java Mon Nov  8 11:23:08 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.oid.stringable.directly;
+package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
 
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 /**
  * An alternative to {@link Encodable}, intended to be used for <tt>Oid</tt>s

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.oid.stringable.directly;
+package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -29,8 +29,8 @@ import java.lang.reflect.Method;
 
 import org.apache.isis.core.commons.ensure.Ensure;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
 
 public class OidStringifierDirect implements OidStringifier {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.oid.stringable.hex;
+package org.apache.isis.core.metamodel.adapter.oid.stringable.hex;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -27,10 +27,10 @@ import java.io.IOException;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
-import org.apache.isis.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.metamodel.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
+import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
 
 
 public class OidStringifierHex implements OidStringifier {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/NullVersion.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/NullVersion.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/NullVersion.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/NullVersion.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/NullVersion.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/NullVersion.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/NullVersion.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.version;
+package org.apache.isis.core.metamodel.adapter.version;
 
 import java.util.Date;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/SerialNumberVersion.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/SerialNumberVersion.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/SerialNumberVersion.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/SerialNumberVersion.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/SerialNumberVersion.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/SerialNumberVersion.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/SerialNumberVersion.java Mon Nov  8 11:23:08 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.version;
+package org.apache.isis.core.metamodel.adapter.version;
 
 import java.io.IOException;
 import java.util.Date;
 
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 
 
 public class SerialNumberVersion extends VersionUserAndTimeAbstract {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.version;
+package org.apache.isis.core.metamodel.adapter.version;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAbstract.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAbstract.java Mon Nov  8 11:23:08 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.version;
+package org.apache.isis.core.metamodel.adapter.version;
 
 import java.io.IOException;
 
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAndTimeAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAndTimeAbstract.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAndTimeAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAndTimeAbstract.java Mon Nov  8 11:23:08 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.metamodel.adapter.version;
+package org.apache.isis.core.metamodel.adapter.version;
 
 import java.io.IOException;
 import java.util.Date;
 
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSession.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSession.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSession.java Mon Nov  8 11:23:08 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.metamodel.authentication;
+package org.apache.isis.core.metamodel.authentication;
 
 import java.util.List;
 
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionAbstract.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/authentication/AuthenticationSessionAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/authentication/AuthenticationSessionAbstract.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/authentication/AuthenticationSessionAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionAbstract.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.authentication;
+package org.apache.isis.core.metamodel.authentication;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -30,10 +30,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 public abstract class AuthenticationSessionAbstract implements AuthenticationSession, Serializable {
 

Modified: 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/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionUtils.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionUtils.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.authentication;
+package org.apache.isis.core.metamodel.authentication;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilder.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilder.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilder.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilder.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilder.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 import java.util.Properties;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderAware.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderAware.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderAware.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 public interface ConfigurationBuilderAware {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderDefault.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderDefault.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderDefault.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderDefault.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderDefault.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderFileSystem.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderFileSystem.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderFileSystem.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderFileSystem.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderFileSystem.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderFileSystem.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderFileSystem.java Mon Nov  8 11:23:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 import org.apache.isis.core.commons.resource.ResourceStreamSource;
 import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreams.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderResourceStreams.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreams.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreams.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderResourceStreams.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationBuilderResourceStreams.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreams.java Mon Nov  8 11:23:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,8 +29,8 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.commons.resource.ResourceStreamSource;
 import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
 import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.metamodel.config.internal.PropertiesReader;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesReader;
 import org.apache.log4j.Logger;
 
 import com.google.common.base.Objects;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationConstants.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationConstants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationConstants.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationConstants.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationConstants.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationConstants.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 public final class ConfigurationConstants {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationException.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationException.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationException.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationPrimer.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationPrimer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationPrimer.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationPrimer.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationPrimer.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/ConfigurationPrimer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationPrimer.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 
 public interface ConfigurationPrimer {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfiguration.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/IsisConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfiguration.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfiguration.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/IsisConfiguration.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/IsisConfiguration.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfiguration.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 import java.awt.Color;
 import java.awt.Font;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfigurationAware.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/IsisConfigurationAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfigurationAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfigurationAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/IsisConfigurationAware.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/IsisConfigurationAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfigurationAware.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/NotFoundPolicy.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/NotFoundPolicy.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/NotFoundPolicy.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/NotFoundPolicy.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/NotFoundPolicy.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/NotFoundPolicy.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/NotFoundPolicy.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
 
 public enum NotFoundPolicy {
 	CONTINUE,

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesConfiguration.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/internal/PropertiesConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesConfiguration.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesConfiguration.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/internal/PropertiesConfiguration.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/internal/PropertiesConfiguration.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesConfiguration.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config.internal;
+package org.apache.isis.core.metamodel.config.internal;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -30,10 +30,10 @@ import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.ConfigurationException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.config.IsisConfigurationAware;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationException;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfigurationAware;
 
 
 public class PropertiesConfiguration implements IsisConfiguration {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesReader.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/internal/PropertiesReader.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesReader.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesReader.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/internal/PropertiesReader.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/config/internal/PropertiesReader.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesReader.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.config.internal;
+package org.apache.isis.core.metamodel.config.internal;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 import org.apache.isis.metamodel.facets.Facet;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/ConsentAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/ConsentAbstract.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/ConsentAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.apache.isis.core.commons.matchers.NofMatchers.nonEmptyStringOrNull;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 import org.apache.isis.metamodel.facets.Facet;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisorFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisorFacet.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisorFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisorFacet.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 import org.apache.isis.metamodel.interactions.InteractionContext;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 import org.apache.isis.metamodel.interactions.InteractionContext;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 import java.util.ArrayList;
 import java.util.Collections;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
 
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 import static org.apache.isis.core.commons.matchers.NofMatchers.nonEmptyString;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.DataInput;
 import java.io.DataInputStream;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.Closeable;
 import java.io.DataInputStream;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.Closeable;
 import java.io.DataInputStream;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.DataOutput;
 import java.io.DataOutputStream;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.Closeable;
 import java.io.DataOutputStream;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputStreamExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputStreamExtended.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputStreamExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputStreamExtended.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.DataOutputStream;
 import java.io.IOException;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataInputExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataInputExtended.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataInputExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataInputExtended.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.IOException;
 import java.util.Arrays;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.IOException;
 import java.io.OutputStream;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/Encodable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/Encodable.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/Encodable.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/Encodable.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.IOException;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/EncodingConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/EncodingConstants.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/EncodingConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/EncodingConstants.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 public class EncodingConstants {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 /**
  * 
  */
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.IOException;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 /**
  * 
  */
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.IOException;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ModelException.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/ModelException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ModelException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ModelException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/ModelException.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/ModelException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ModelException.java Mon Nov  8 11:23:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.exceptions;
+package org.apache.isis.core.metamodel.exceptions;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ReflectionException.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/ReflectionException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ReflectionException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ReflectionException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/ReflectionException.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/ReflectionException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ReflectionException.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.exceptions;
+package org.apache.isis.core.metamodel.exceptions;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facetdecorator;
+package org.apache.isis.core.metamodel.facetdecorator;
 
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facetdecorator;
+package org.apache.isis.core.metamodel.facetdecorator;
 
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facetdecorator/FacetDecoratorSet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facetdecorator/FacetDecoratorSet.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facetdecorator/FacetDecoratorSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.facetdecorator;
+package org.apache.isis.core.metamodel.facetdecorator;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -31,10 +31,10 @@ import java.util.Set;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.exceptions.ReflectionException;
+import org.apache.isis.core.metamodel.exceptions.ReflectionException;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
 
 public class FacetDecoratorSet implements ApplicationScopedComponent {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DefaultProvider.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DefaultProvider.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DefaultProvider.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DefaultProvider.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DefaultProvider.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DefaultProvider.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DefaultProvider.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 public interface DefaultProvider {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Dirtiable.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Dirtiable.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Dirtiable.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Dirtiable.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Dirtiable.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Dirtiable.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Dirtiable.java Mon Nov  8 11:23:08 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 
 public interface Dirtiable {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Hierarchical.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Hierarchical.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Hierarchical.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 public interface Hierarchical {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/IntrospectableSpecification.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/IntrospectableSpecification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/IntrospectableSpecification.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/IntrospectableSpecification.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/IntrospectableSpecification.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/IntrospectableSpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/IntrospectableSpecification.java Mon Nov  8 11:23:08 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
-import org.apache.isis.metamodel.facetdecorator.FacetDecoratorSet;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorSet;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribed.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/NamedAndDescribed.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribed.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribed.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/NamedAndDescribed.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/NamedAndDescribed.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribed.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 /**
  * Anything in the metamodel (which also includes peers in the reflector) that has a name and description.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribedFacetHolder.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/NamedAndDescribedFacetHolder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribedFacetHolder.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribedFacetHolder.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/NamedAndDescribedFacetHolder.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/NamedAndDescribedFacetHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/NamedAndDescribedFacetHolder.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 import org.apache.isis.metamodel.facets.FacetHolder;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java Mon Nov  8 11:23:08 2010
@@ -18,14 +18,16 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResult;
+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;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationContainer;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.facets.hide.HiddenFacet;
 import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacet;
@@ -37,8 +39,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.interactions.InteractionContext;
 import org.apache.isis.metamodel.interactions.ObjectTitleContext;
 import org.apache.isis.metamodel.interactions.ObjectValidityContext;
-import org.apache.isis.metamodel.spec.feature.ObjectActionContainer;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociationContainer;
 
 
 public interface ObjectSpecification extends Specification, ObjectActionContainer, ObjectAssociationContainer, Hierarchical, Dirtiable, DefaultProvider {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationException.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecificationException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecificationException.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecificationException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationException.java Mon Nov  8 11:23:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 /**
  * A runtime exception indicating an problem has occurred within the Apache Isis framework.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Persistability.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Persistability.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Persistability.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Persistability.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Persistability.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Persistability.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Persistability.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 public enum Persistability {
     /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecObjectPair.java (from r1032505, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/SpecObjectPair.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecObjectPair.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecObjectPair.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/SpecObjectPair.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/SpecObjectPair.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecObjectPair.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 import org.apache.isis.core.commons.lang.HashCodeUtils;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Specification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Specification.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Specification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java Mon Nov  8 11:23:08 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
 
 /**
  * Base interface for elements of the metamodel.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationFacets.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/SpecificationFacets.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationFacets.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationFacets.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/SpecificationFacets.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/SpecificationFacets.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationFacets.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 import org.apache.isis.metamodel.facets.When;
 import org.apache.isis.metamodel.facets.object.bounded.BoundedFacet;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Target.java (from r1032498, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Target.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Target.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Target.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Target.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/Target.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Target.java Mon Nov  8 11:23:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
 
 public enum Target {