You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/01/08 23:54:01 UTC
svn commit: r1056832 [13/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/
alternat...
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/Options.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/Options.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/Options.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/Options.java Sat Jan 8 22:53:36 2011
@@ -24,11 +24,11 @@ import java.util.Enumeration;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.debug.DebugString;
-public class Options implements DebugInfo {
+public class Options implements DebuggableWithTitle {
private final Properties properties = new Properties();
public void addOption(String name, String value) {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java Sat Jan 8 22:53:36 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.use
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -32,7 +32,7 @@ import org.apache.isis.core.runtime.pers
import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.core.runtime.persistence.services.ServiceUtil;
-public class PerspectiveEntry implements DebugInfo {
+public class PerspectiveEntry implements DebuggableWithTitle {
private final List<Object> objects = new ArrayList<Object>();
private final List<Object> services = new ArrayList<Object>();
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java Sat Jan 8 22:53:36 2011
@@ -23,13 +23,13 @@ package org.apache.isis.core.runtime.use
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-public class UserProfile implements DebugInfo {
+public class UserProfile implements DebuggableWithTitle {
private final Options options = new Options();
private final List<PerspectiveEntry> entries = new ArrayList<PerspectiveEntry>();
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java Sat Jan 8 22:53:36 2011
@@ -22,9 +22,9 @@ package org.apache.isis.core.runtime.use
import java.util.List;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.persistence.PersistenceSession;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoaderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoaderDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoaderDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoaderDefault.java Sat Jan 8 22:53:36 2011
@@ -21,11 +21,11 @@ package org.apache.isis.core.runtime.use
import java.util.List;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
@@ -34,7 +34,7 @@ import org.apache.log4j.Logger;
/**
* Acts like a bridge, loading the profile from the underlying store.
*/
-public class UserProfileLoaderDefault implements UserProfileLoader, DebugInfo {
+public class UserProfileLoaderDefault implements UserProfileLoader, DebuggableWithTitle {
private static final String DEFAULT_PERSPECTIVE_NAME = "Apache Isis";
private static final String EXPLORATION = " Exploration";
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStoreInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStoreInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStoreInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStoreInstaller.java Sat Jan 8 22:53:36 2011
@@ -21,7 +21,7 @@
package org.apache.isis.core.runtime.userprofile;
import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
public interface UserProfileStoreInstaller extends Installer {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/util/Dump.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/util/Dump.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/util/Dump.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/util/Dump.java Sat Jan 8 22:53:36 2011
@@ -24,11 +24,11 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Vector;
-import org.apache.isis.core.commons.debug.Debug;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.debug.DebugUtils;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.SpecificationFacets;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
@@ -157,9 +157,9 @@ public final class Dump {
private static void graphIndent(final DebugString s, final int level) {
for (int indent = 0; indent < level; indent++) {
- s.append(Debug.indentString(4) + "|");
+ s.append(DebugUtils.indentString(4) + "|");
}
- s.append(Debug.indentString(4) + "+--");
+ s.append(DebugUtils.indentString(4) + "+--");
}
public static String adapter(final ObjectAdapter object) {
@@ -272,8 +272,8 @@ public final class Dump {
debug.appendException(e);
}
- if (specification instanceof DebugInfo) {
- ((DebugInfo) specification).debugData(debug);
+ if (specification instanceof DebuggableWithTitle) {
+ ((DebuggableWithTitle) specification).debugData(debug);
}
debug.blankLine();
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewer.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewer.java Sat Jan 8 22:53:36 2011
@@ -21,7 +21,7 @@
package org.apache.isis.core.runtime.viewer;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilderAware;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilderAware;
import org.apache.isis.core.runtime.installers.InstallerLookupAware;
import org.apache.isis.core.runtime.web.WebAppSpecification;
@@ -33,7 +33,7 @@ import org.apache.isis.core.runtime.web.
* The mechanism may be realized as a user interface (for example the DnD viewer or HTML viewer) but might
* also be an abstract 'remoting' viewer of sockets or HTTP servlet requests.
*/
-public interface IsisViewer extends ApplicationScopedComponent, InstallerLookupAware, ConfigurationBuilderAware {
+public interface IsisViewer extends ApplicationScopedComponent, InstallerLookupAware, IsisConfigurationBuilderAware {
/**
* Provide requirement for running a viewer from within an embedded web container.
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerAbstract.java Sat Jan 8 22:53:36 2011
@@ -21,10 +21,10 @@
package org.apache.isis.core.runtime.viewer;
import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilderAware;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.ensure.Ensure;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilderAware;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
@@ -49,7 +49,7 @@ public abstract class IsisViewerAbstract
private DeploymentType deploymentType;
private InstallerLookup installerLookup;
- private ConfigurationBuilder configurationBuilder;
+ private IsisConfigurationBuilder isisConfigurationBuilder;
private IsisSystem system; // never written to!!!
/**
@@ -65,7 +65,7 @@ public abstract class IsisViewerAbstract
ensureDependenciesInjected();
- IsisConfiguration configuration = configurationBuilder.getConfiguration();
+ IsisConfiguration configuration = isisConfigurationBuilder.getConfiguration();
deploymentType = DeploymentType.lookup(configuration.getString(SystemConstants.DEPLOYMENT_TYPE_KEY));
String user = configuration.getString(SystemConstants.USER_KEY);
@@ -119,7 +119,7 @@ public abstract class IsisViewerAbstract
protected void ensureDependenciesInjected() {
Ensure.ensureThatState(installerLookup, is(not(nullValue())));
- Ensure.ensureThatState(configurationBuilder, is(not(nullValue())));
+ Ensure.ensureThatState(isisConfigurationBuilder, is(not(nullValue())));
}
/**
@@ -129,15 +129,15 @@ public abstract class IsisViewerAbstract
this.installerLookup = installerLookup;
}
- protected ConfigurationBuilder getConfigurationBuilder() {
- return configurationBuilder;
+ protected IsisConfigurationBuilder getConfigurationBuilder() {
+ return isisConfigurationBuilder;
}
/**
- * Injected by virtue of being {@link ConfigurationBuilderAware}.
+ * Injected by virtue of being {@link IsisConfigurationBuilderAware}.
*/
- public void setConfigurationBuilder(final ConfigurationBuilder configurationBuilder) {
- this.configurationBuilder = configurationBuilder;
+ public void setConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder) {
+ this.isisConfigurationBuilder = isisConfigurationBuilder;
}
// ////////////////////////////////////////////////////////////////
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerInstallerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerInstallerAbstract.java Sat Jan 8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.vie
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.runtime.installers.InstallerLookup;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerNoop.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/viewer/IsisViewerNoop.java Sat Jan 8 22:53:36 2011
@@ -21,7 +21,7 @@
package org.apache.isis.core.runtime.viewer;
import org.apache.isis.core.commons.components.Noop;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.installers.InstallerLookup;
import org.apache.isis.core.runtime.web.WebAppSpecification;
@@ -34,7 +34,7 @@ public class IsisViewerNoop implements I
public void setInstallerLookup(InstallerLookup installerLookup) {
}
- public void setConfigurationBuilder(ConfigurationBuilder configurationLoader) {
+ public void setConfigurationBuilder(IsisConfigurationBuilder configurationLoader) {
}
public boolean bootstrapsSystem() {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/web/EmbeddedWebServerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/web/EmbeddedWebServerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/web/EmbeddedWebServerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/web/EmbeddedWebServerAbstract.java Sat Jan 8 22:53:36 2011
@@ -24,7 +24,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.context.IsisContext;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstractTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstractTest.java Sat Jan 8 22:53:36 2011
@@ -29,8 +29,9 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/MultiUserExplorationSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/MultiUserExplorationSessionTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/MultiUserExplorationSessionTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/MultiUserExplorationSessionTest.java Sat Jan 8 22:53:36 2011
@@ -36,8 +36,9 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
import org.apache.isis.core.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationAuthenticator;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java Sat Jan 8 22:53:36 2011
@@ -26,8 +26,9 @@ import static org.junit.Assert.assertTha
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java Sat Jan 8 22:53:36 2011
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
public abstract class SimpleSessionEncodabilityTestAbstract extends EncodabilityContractTest {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java Sat Jan 8 22:53:36 2011
@@ -22,7 +22,8 @@ package org.apache.isis.core.runtime.aut
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+
+import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java Sat Jan 8 22:53:36 2011
@@ -33,8 +33,9 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java Sat Jan 8 22:53:36 2011
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTha
import java.util.List;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.runtime.authentication.NoAuthenticatorException;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java Sat Jan 8 22:53:36 2011
@@ -30,7 +30,8 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
import org.apache.isis.core.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationAuthenticator;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticatorTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticatorTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticatorTest.java Sat Jan 8 22:53:36 2011
@@ -30,8 +30,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
import org.apache.isis.core.runtime.authentication.standard.exploration.MultiUserExplorationSession;
import org.apache.isis.core.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/context/IsisContextTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/context/IsisContextTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/context/IsisContextTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/context/IsisContextTest.java Sat Jan 8 22:53:36 2011
@@ -31,9 +31,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
@@ -84,7 +85,7 @@ public class IsisContextTest {
mockAuthenticationManager = mockery.mock(AuthenticationManager.class);
mockAuthorizationManager = mockery.mock(AuthorizationManager.class);
- configuration = new PropertiesConfiguration();
+ configuration = new IsisConfigurationDefault();
reflector = new TestProxyReflector();
persistenceSession = new TestProxyPersistenceSession(mockPersistenceSessionFactory);
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/help/file/SimpleHelpManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/help/file/SimpleHelpManagerTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/help/file/SimpleHelpManagerTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/help/file/SimpleHelpManagerTest.java Sat Jan 8 22:53:36 2011
@@ -27,8 +27,8 @@ import java.io.StringReader;
import junit.framework.TestCase;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.progmodel.facetdecorators.help.file.internal.HelpManagerUsingFiles;
@@ -42,7 +42,7 @@ public class SimpleHelpManagerTest exten
@Override
protected void setUp() throws Exception {
- manager = new TestHelpManager(new PropertiesConfiguration());
+ manager = new TestHelpManager(new IsisConfigurationDefault());
}
public void testNoLines() {
@@ -138,7 +138,7 @@ public class SimpleHelpManagerTest exten
public void testMessageForFileError() {
final Identifier identifier = Identifier.propertyOrCollectionIdentifier("cls", "fld2");
- final HelpManagerUsingFiles manager = new HelpManagerUsingFiles(new PropertiesConfiguration()) {
+ final HelpManagerUsingFiles manager = new HelpManagerUsingFiles(new IsisConfigurationDefault()) {
@Override
protected BufferedReader getReader() throws FileNotFoundException {
throw new FileNotFoundException("not found");
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/memento/MementoTest2_Test.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/memento/MementoTest2_Test.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/memento/MementoTest2_Test.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/memento/MementoTest2_Test.java Sat Jan 8 22:53:36 2011
@@ -33,10 +33,10 @@ import org.jmock.lib.legacy.ClassImposte
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.core.commons.encoding.DataOutputStreamExtended;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/memento/MementoTest3_Test.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/memento/MementoTest3_Test.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/memento/MementoTest3_Test.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/memento/MementoTest3_Test.java Sat Jan 8 22:53:36 2011
@@ -33,12 +33,13 @@ import org.jmock.lib.legacy.ClassImposte
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.commons.encoding.DataOutputStreamExtended;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityAbstractTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityAbstractTest.java Sat Jan 8 22:53:36 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.per
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
public abstract class SerialOidEncodabilityAbstractTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentTest.java Sat Jan 8 22:53:36 2011
@@ -24,8 +24,8 @@ import static org.hamcrest.CoreMatchers.
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
public class SerialOidEncodabilityWhenPersistentTest extends SerialOidEncodabilityAbstractTest {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentWithPreviousTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentWithPreviousTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentWithPreviousTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentWithPreviousTest.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.core.runtime.persistence.oidgenerator.simple;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
public class SerialOidEncodabilityWhenPersistentWithPreviousTest extends SerialOidEncodabilityAbstractTest {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenTransientTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenTransientTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenTransientTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenTransientTest.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.core.runtime.persistence.oidgenerator.simple;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
public class SerialOidEncodabilityWhenTransientTest extends SerialOidEncodabilityAbstractTest {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java Sat Jan 8 22:53:36 2011
@@ -32,11 +32,11 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.Identifier;
+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.ServicesProvider;
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java Sat Jan 8 22:53:36 2011
@@ -30,8 +30,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+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.facetapi.FeatureType;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java Sat Jan 8 22:53:36 2011
@@ -33,10 +33,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.Identifier;
+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.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
Added: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/FacetHolderNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/FacetHolderNoop.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/FacetHolderNoop.java (added)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/FacetHolderNoop.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,73 @@
+/*
+ * 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.runtime.testspec;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
+
+
+/**
+ * Has no functionality but makes it easier to write tests that require an instance of an {@link Identifier}.
+ */
+public class FacetHolderNoop implements FacetHolder {
+
+ @Override
+ public void addFacet(final Facet facet) {}
+
+ @Override
+ public void addFacet(final MultiTypedFacet facet) {}
+
+ @Override
+ public boolean containsFacet(final Class<? extends Facet> facetType) {
+ return false;
+ }
+
+ @Override
+ public <T extends Facet> T getFacet(final Class<T> cls) {
+ return null;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Class<? extends Facet>[] getFacetTypes() {
+ return new Class[0];
+ }
+
+ @Override
+ public Facet[] getFacets(final Filter<Facet> filter) {
+ return new Facet[0];
+ }
+
+ public Identifier getIdentifier() {
+ return null;
+ }
+
+ @Override
+ public void removeFacet(final Facet facet) {}
+
+ @Override
+ public void removeFacet(final Class<? extends Facet> facetType) {}
+
+}
+
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java Sat Jan 8 22:53:36 2011
@@ -23,8 +23,8 @@ package org.apache.isis.core.runtime.tes
import java.util.Arrays;
import java.util.List;
+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.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/OneToOneAssociationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/OneToOneAssociationTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/OneToOneAssociationTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/OneToOneAssociationTest.java Sat Jan 8 22:53:36 2011
@@ -20,14 +20,13 @@
package org.apache.isis.core.runtime.testspec;
-import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
@@ -49,65 +48,81 @@ public abstract class OneToOneAssociatio
runtimeContext = new RuntimeContextFromSession();
}
- public boolean isOneToManyAssociation() {
+ @Override
+ public boolean isOneToManyAssociation() {
return false;
}
+ @Override
public boolean isOneToOneAssociation() {
return true;
}
+ @Override
public void clearAssociation(final ObjectAdapter inObject) {
throw new UnexpectedCallException();
}
+ @Override
public String getBusinessKeyName() {
return "";
}
+ @Override
public String getDescription() {
return "";
}
+ @Override
public String getHelp() {
return "";
}
+ @Override
public ObjectAdapter[] getChoices(final ObjectAdapter target) {
return null;
}
+ @Override
public boolean isEmpty(final ObjectAdapter adapter) {
return false;
}
+ @Override
public boolean isMandatory() {
return false;
}
+ @Override
public boolean hasChoices() {
return false;
}
+ @Override
public boolean isNotPersisted() {
return false;
}
+ @Override
public Consent isUsable(final AuthenticationSession session, final ObjectAdapter target) {
return Allow.DEFAULT;
}
+ @Override
public boolean isAlwaysHidden() {
return false;
}
+ @Override
public Consent isVisible(final AuthenticationSession session, final ObjectAdapter target) {
return Allow.DEFAULT;
}
+ @Override
public ObjectAdapter getDefault(final ObjectAdapter adapter) {
return null;
}
+ @Override
public void toDefault(final ObjectAdapter target) {}
@Override
@@ -115,6 +130,7 @@ public abstract class OneToOneAssociatio
return null;
}
+ @Override
public VisibilityContext<?> createVisibleInteractionContext(
final AuthenticationSession session,
final InteractionInvocationMethod invocationMethod,
@@ -122,6 +138,7 @@ public abstract class OneToOneAssociatio
return null;
}
+ @Override
public UsabilityContext<?> createUsableInteractionContext(
final AuthenticationSession session,
final InteractionInvocationMethod invocationMethod,
@@ -129,6 +146,7 @@ public abstract class OneToOneAssociatio
return null;
}
+ @Override
public ValidityContext<?> createValidateInteractionContext(
final AuthenticationSession session,
final InteractionInvocationMethod invocationMethod,
@@ -137,6 +155,7 @@ public abstract class OneToOneAssociatio
return null;
}
+ @Override
public PropertyAccessContext createAccessInteractionContext(
final AuthenticationSession session,
final InteractionInvocationMethod interactionMethod,
@@ -144,15 +163,18 @@ public abstract class OneToOneAssociatio
return null;
}
+ @Override
public Instance getInstance(ObjectAdapter adapter) {
OneToOneAssociation specification = this;
return adapter.getInstance(specification);
}
+ @Override
public boolean isAction() {
return false;
}
+ @Override
public boolean isPropertyOrCollection() {
return true;
}
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/ValueFieldTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/ValueFieldTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/ValueFieldTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/ValueFieldTest.java Sat Jan 8 22:53:36 2011
@@ -20,13 +20,12 @@
package org.apache.isis.core.runtime.testspec;
-import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.Identifier;
+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.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
@@ -49,9 +48,11 @@ public abstract class ValueFieldTest ext
return runtimeContext;
}
+ @Override
public boolean isOneToManyAssociation() {
return false;
}
+ @Override
public boolean isOneToOneAssociation() {
return true;
}
@@ -64,14 +65,17 @@ public abstract class ValueFieldTest ext
return false;
}
+ @Override
public String getDescription() {
return "";
}
+ @Override
public String getBusinessKeyName() {
return "";
}
+ @Override
public ObjectAdapter[] getChoices(final ObjectAdapter target) {
return null;
}
@@ -88,18 +92,22 @@ public abstract class ValueFieldTest ext
return 0;
}
+ @Override
public String getHelp() {
return "";
}
+ @Override
public Consent isUsable(final AuthenticationSession session, final ObjectAdapter target) {
return Allow.DEFAULT;
}
+ @Override
public boolean isAlwaysHidden() {
return false;
}
+ @Override
public Consent isVisible(final AuthenticationSession session, final ObjectAdapter target) {
return Allow.DEFAULT;
}
@@ -108,18 +116,22 @@ public abstract class ValueFieldTest ext
return false;
}
+ @Override
public boolean isNotPersisted() {
return false;
}
+ @Override
public boolean isEmpty(final ObjectAdapter adapter) {
return false;
}
+ @Override
public boolean isMandatory() {
return false;
}
+ @Override
public boolean hasChoices() {
return false;
}
@@ -136,10 +148,12 @@ public abstract class ValueFieldTest ext
return true;
}
+ @Override
public ObjectAdapter getDefault(final ObjectAdapter adapter) {
return null;
}
+ @Override
public void toDefault(final ObjectAdapter target) {}
@Override
@@ -147,6 +161,7 @@ public abstract class ValueFieldTest ext
return null;
}
+ @Override
public VisibilityContext<?> createVisibleInteractionContext(
final AuthenticationSession session,
final InteractionInvocationMethod invocationMethod,
@@ -154,6 +169,7 @@ public abstract class ValueFieldTest ext
return null;
}
+ @Override
public UsabilityContext<?> createUsableInteractionContext(
final AuthenticationSession session,
final InteractionInvocationMethod invocationMethod,
@@ -161,6 +177,7 @@ public abstract class ValueFieldTest ext
return null;
}
+ @Override
public ValidityContext<?> createValidateInteractionContext(
final AuthenticationSession session,
final InteractionInvocationMethod invocationMethod,
@@ -169,6 +186,7 @@ public abstract class ValueFieldTest ext
return null;
}
+ @Override
public PropertyAccessContext createAccessInteractionContext(
final AuthenticationSession session,
final InteractionInvocationMethod interactionMethod,
@@ -176,15 +194,18 @@ public abstract class ValueFieldTest ext
return null;
}
+ @Override
public Instance getInstance(ObjectAdapter adapter) {
OneToOneAssociation specification = this;
return adapter.getInstance(specification);
}
+ @Override
public boolean isAction() {
return false;
}
+ @Override
public boolean isPropertyOrCollection() {
return true;
}
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/AuthenticationManagerNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/AuthenticationManagerNoop.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/AuthenticationManagerNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/AuthenticationManagerNoop.java Sat Jan 8 22:53:36 2011
@@ -20,8 +20,8 @@
package org.apache.isis.core.runtime.testsystem;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.Noop;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/AuthorizationManagerNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/AuthorizationManagerNoop.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/AuthorizationManagerNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/AuthorizationManagerNoop.java Sat Jan 8 22:53:36 2011
@@ -21,8 +21,8 @@
package org.apache.isis.core.runtime.testsystem;
import org.apache.isis.applib.Identifier;
+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.runtime.authorization.AuthorizationManager;
public class AuthorizationManagerNoop implements AuthorizationManager {
Added: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/FacetHolderNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/FacetHolderNoop.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/FacetHolderNoop.java (added)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/FacetHolderNoop.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,73 @@
+/*
+ * 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.runtime.testsystem;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
+
+
+/**
+ * Has no functionality but makes it easier to write tests that require an instance of an {@link Identifier}.
+ */
+public class FacetHolderNoop implements FacetHolder {
+
+ @Override
+ public void addFacet(final Facet facet) {}
+
+ @Override
+ public void addFacet(final MultiTypedFacet facet) {}
+
+ @Override
+ public boolean containsFacet(final Class<? extends Facet> facetType) {
+ return false;
+ }
+
+ @Override
+ public <T extends Facet> T getFacet(final Class<T> cls) {
+ return null;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Class<? extends Facet>[] getFacetTypes() {
+ return new Class[0];
+ }
+
+ @Override
+ public Facet[] getFacets(final Filter<Facet> filter) {
+ return new Facet[0];
+ }
+
+ public Identifier getIdentifier() {
+ return null;
+ }
+
+ @Override
+ public void removeFacet(final Facet facet) {}
+
+ @Override
+ public void removeFacet(final Class<? extends Facet> facetType) {}
+
+}
+
Copied: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ServicesInjectorNoop.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorNoop.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ServicesInjectorNoop.java?p2=incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ServicesInjectorNoop.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorNoop.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ServicesInjectorNoop.java Sat Jan 8 22:53:36 2011
@@ -18,12 +18,13 @@
*/
-package org.apache.isis.core.metamodel.services;
+package org.apache.isis.core.runtime.testsystem;
import java.util.List;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.core.commons.components.Noop;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
public class ServicesInjectorNoop implements ServicesInjector, Noop {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java Sat Jan 8 22:53:36 2011
@@ -23,14 +23,13 @@ package org.apache.isis.core.runtime.tes
import java.util.List;
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.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java Sat Jan 8 22:53:36 2011
@@ -25,9 +25,9 @@ import java.util.Hashtable;
import junit.framework.Assert;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.ConsentAbstract;
@@ -35,7 +35,6 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.consent.InteractionResult;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
import org.apache.isis.core.metamodel.interactions.InteractionContext;
import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyConfiguration.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyConfiguration.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyConfiguration.java Sat Jan 8 22:53:36 2011
@@ -24,13 +24,14 @@ import java.awt.Color;
import java.awt.Font;
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Iterator;
import junit.framework.AssertionFailedError;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
public class TestProxyConfiguration implements IsisConfiguration {
@@ -47,66 +48,79 @@ public class TestProxyConfiguration impl
valueByKey.put(key, value);
}
+ @Override
public boolean getBoolean(final String name) {
return Boolean.valueOf(getString(name)).booleanValue();
}
+ @Override
public boolean getBoolean(final String name, final boolean defaultValue) {
final String str = getString(name);
return str == null ? defaultValue : Boolean.valueOf(str).booleanValue();
}
+ @Override
public Color getColor(final String name) {
throw new NotYetImplementedException();
}
+ @Override
public Color getColor(final String name, final Color defaultColor) {
return defaultColor;
}
+ @Override
public Font getFont(final String name) {
throw new NotYetImplementedException();
}
+ @Override
public Font getFont(final String name, final Font defaultValue) {
return defaultValue;
}
+ @Override
public int getInteger(final String name) {
return Integer.valueOf(getString(name)).intValue();
}
+ @Override
public int getInteger(final String name, final int defaultValue) {
final String str = getString(name);
return str == null ? defaultValue : Integer.valueOf(str).intValue();
}
+ @Override
public String[] getList(final String name) {
return new String[0];
}
+ @Override
public IsisConfiguration getProperties(final String withPrefix) {
final TestProxyConfiguration configuration = new TestProxyConfiguration();
final Enumeration<String> keys = valueByKey.keys();
while (keys.hasMoreElements()) {
- final String key = (String) keys.nextElement();
+ final String key = keys.nextElement();
if (key.startsWith(withPrefix)) {
- configuration.add(key.substring(withPrefix.length()), (String) valueByKey.get(key));
+ configuration.add(key.substring(withPrefix.length()), valueByKey.get(key));
}
}
return configuration;
}
+ @Override
public String getString(final String name) {
- return (String) valueByKey.get(name);
+ return valueByKey.get(name);
}
+ @Override
public String getString(final String name, final String defaultValue) {
final String str = getString(name);
return str == null ? defaultValue : str;
}
+ @Override
public boolean hasProperty(final String name) {
throw new NotYetImplementedException();
}
@@ -115,32 +129,40 @@ public class TestProxyConfiguration impl
throw new NotYetImplementedException();
}
+ @Override
public IsisConfiguration createSubset(final String prefix) {
throw new NotYetImplementedException();
}
+ @Override
public boolean isEmpty() {
throw new NotYetImplementedException();
}
+ @Override
public int size() {
throw new NotYetImplementedException();
}
- public Enumeration<String> propertyNames() {
+ @Override
+ public Iterator<String> iterator() {
throw new NotYetImplementedException();
}
- public ResourceStreamSource getResourceStreamSource() {
+ @Override
+ public ResourceStreamSource getResourceStreamSource() {
return null;
}
+ @Override
public void debugData(final DebugString debug) {}
+ @Override
public String debugTitle() {
throw new NotYetImplementedException();
}
+ @Override
public void injectInto(Object candidate) {}
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java Sat Jan 8 22:53:36 2011
@@ -21,8 +21,8 @@
package org.apache.isis.core.runtime.testsystem;
import org.apache.isis.applib.Identifier;
+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.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyOid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyOid.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyOid.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyOid.java Sat Jan 8 22:53:36 2011
@@ -20,8 +20,8 @@
package org.apache.isis.core.runtime.testsystem;
+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 class TestProxyOid implements Oid {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java Sat Jan 8 22:53:36 2011
@@ -30,7 +30,6 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.services.ServicesInjectorNoop;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySession.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySession.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySession.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.core.runtime.testsystem;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionAbstract;
public class TestProxySession extends AuthenticationSessionAbstract {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySystem.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySystem.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySystem.java Sat Jan 8 22:53:36 2011
@@ -23,11 +23,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Vector;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java Sat Jan 8 22:53:36 2011
@@ -27,16 +27,15 @@ 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.exceptions.IsisException;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.core.commons.filters.Filter;
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.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.spec.ActionType;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestUserProfileStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestUserProfileStore.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestUserProfileStore.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestUserProfileStore.java Sat Jan 8 22:53:36 2011
@@ -23,12 +23,12 @@ package org.apache.isis.core.runtime.tes
import java.util.HashMap;
import java.util.Map;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.runtime.userprofile.UserProfile;
import org.apache.isis.core.runtime.userprofile.UserProfileStore;
-public class TestUserProfileStore implements UserProfileStore, DebugInfo {
+public class TestUserProfileStore implements UserProfileStore, DebuggableWithTitle {
private static final Map<String, UserProfile> profiles = new HashMap<String, UserProfile>();
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/TestProxyConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/TestProxyConfigurationTest.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/TestProxyConfigurationTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/TestProxyConfigurationTest.java Sat Jan 8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.tes
import junit.framework.TestCase;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.testsystem.TestProxyConfiguration;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java Sat Jan 8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.tra
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.runtime.transaction.messagebroker.MessageBroker;
import org.apache.isis.core.runtime.transaction.messagebroker.MessageBrokerInstaller;