isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1030308 [7/8] - in /incubator/isis/trunk: alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ alternatives/remoting/common/src/test/ja...
Date Wed, 03 Nov 2010 01:24:23 GMT
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java Wed Nov  3 01:24:18 2010
@@ -17,406 +17,400 @@
  *  under the License.
  */
 
+package org.apache.isis.runtime.system;
 
-package org.apache.isis.runtime.system;
-
-import java.io.File;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.commons.components.Installer;
-import org.apache.isis.commons.components.NoopUtils;
-import org.apache.isis.commons.debug.DebugInfo;
-import org.apache.isis.commons.debug.DebugString;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.ObjectReflector;
+import java.io.File;
+import java.util.List;
+
+import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.commons.components.Installer;
+import org.apache.isis.commons.components.NoopUtils;
+import org.apache.isis.commons.debug.DebugInfo;
+import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.runtime.about.AboutIsis;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authentication.standard.exploration.ExplorationSession;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.fixturesinstaller.FixturesInstaller;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtime.imageloader.awt.TemplateImageLoaderAwt;
-import org.apache.isis.runtime.installers.InstallerLookup;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
-import org.apache.isis.runtime.system.internal.InitialisationSession;
-import org.apache.isis.runtime.system.internal.IsisLocaleInitializer;
-import org.apache.isis.runtime.system.internal.IsisTimeZoneInitializer;
-import org.apache.isis.runtime.system.internal.SplashWindow;
-import org.apache.isis.runtime.userprofile.UserProfileStore;
-
-
+import org.apache.isis.runtime.authentication.AuthenticationManager;
+import org.apache.isis.runtime.authentication.standard.exploration.ExplorationSession;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.fixturesinstaller.FixturesInstaller;
+import org.apache.isis.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.runtime.imageloader.awt.TemplateImageLoaderAwt;
+import org.apache.isis.runtime.installers.InstallerLookup;
+import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.runtime.system.internal.InitialisationSession;
+import org.apache.isis.runtime.system.internal.IsisLocaleInitializer;
+import org.apache.isis.runtime.system.internal.IsisTimeZoneInitializer;
+import org.apache.isis.runtime.system.internal.SplashWindow;
+import org.apache.isis.runtime.userprofile.UserProfileStore;
+import org.apache.log4j.Logger;
+
 /**
  * 
- */
-public abstract class IsisSystemAbstract implements IsisSystem {
-
-    public static final Logger LOG = Logger.getLogger(IsisSystemAbstract.class);
-
-    private static final int SPLASH_DELAY_DEFAULT = 6;
-
-    private final IsisLocaleInitializer localeInitializer;
-    private final IsisTimeZoneInitializer timeZoneInitializer;
-    private final DeploymentType deploymentType;
-
-    private SplashWindow splashWindow;
-
-    private FixturesInstaller fixtureInstaller;
-    
-    private boolean initialized = false;
-
-    private IsisSessionFactory sessionFactory;
-
-    private LogonFixture logonFixture;
-
-    // ///////////////////////////////////////////
-    // Constructors
-    // ///////////////////////////////////////////
-
-    public IsisSystemAbstract(final DeploymentType deploymentType) {
-        this(deploymentType, new IsisLocaleInitializer(), new IsisTimeZoneInitializer());
-    }
-
-    public IsisSystemAbstract(
-            final DeploymentType deploymentType,
-            final IsisLocaleInitializer localeInitializer,
-            final IsisTimeZoneInitializer timeZoneInitializer) {
-        this.deploymentType = deploymentType;
-        this.localeInitializer = localeInitializer;
-        this.timeZoneInitializer = timeZoneInitializer;
-    }
-
-    // ///////////////////////////////////////////
-    // DeploymentType
-    // ///////////////////////////////////////////
-
-    public DeploymentType getDeploymentType() {
-        return deploymentType;
-    }
-
-    // ///////////////////////////////////////////
-    // init, shutdown
-    // ///////////////////////////////////////////
-
-    public void init() {
-
-        if (initialized) {
-            throw new IllegalStateException("Already initialized");
-        } else {
-            initialized = true;
-        }
-
-        LOG.info("initialising [[NAME]] system");
-        LOG.info("working directory: " + new File(".").getAbsolutePath());
-        LOG.info("resource stream source: " + getConfiguration().getResourceStreamSource());
-
-        localeInitializer.initLocale(getConfiguration());
-        timeZoneInitializer.initTimeZone(getConfiguration());
-
-        int splashDelay = SPLASH_DELAY_DEFAULT;
-        try {
-            TemplateImageLoader splashLoader = obtainTemplateImageLoader();
-            splashLoader.init();
-            showSplash(splashLoader);
-
-            // temporarily make a configuration available
-            // REVIEW: would rather inject this, or perhaps even the ConfigurationBuilder
-            IsisContext.setConfiguration(getConfiguration());
-            
-            sessionFactory = doCreateSessionFactory(deploymentType);
-            
-
-            initContext(sessionFactory);
-            sessionFactory.init();
-
-            installFixturesIfRequired();
-            
-        } catch (IsisSystemException ex) {
-            LOG.error("failed to initialise", ex);
-            splashDelay = 0;
-            throw new RuntimeException(ex);
-        } finally {
-            removeSplash(splashDelay);
-        }
-    }
-
-	private void installFixturesIfRequired() throws IsisSystemException {
-		// some deployment types (eg CLIENT) do not support installing fixtures
-		// instead, any fixtures should be installed when server boots up.
-		if (!deploymentType.canInstallFixtures()) {
-			return;
-		}
-		
-		fixtureInstaller = obtainFixturesInstaller();
-		if (fixtureInstaller == null || NoopUtils.isNoop(fixtureInstaller)) {
-			return;
-		}
-		
-		IsisContext.openSession(new InitialisationSession());
-		fixtureInstaller.installFixtures();
-		try {
-			
-				
-				// only allow logon fixtures if not in production mode.
-				if (!deploymentType.isProduction()) {
-					logonFixture = fixtureInstaller.getLogonFixture();
-				}
-		} finally {
-			IsisContext.closeSession();
-		}
-	}
-
-    private void initContext(IsisSessionFactory sessionFactory) {
-    	getDeploymentType().initContext(sessionFactory);
-    }
-
-    public void shutdown() {
-        LOG.info("shutting down system");
-        IsisContext.closeAllSessions();
-    }
-
-    // ///////////////////////////////////////////
-    // Hook:
-    // ///////////////////////////////////////////
-
-    /**
-     * Hook method; the returned implementation is expected to use the same general approach as the subclass
-     * itself.
-     * 
-     * <p>
-     * So, for example, <tt>IsisSystemUsingInstallers</tt> uses the {@link InstallerLookup} mechanism
-     * to find its components. The corresponding <tt>ExecutionContextFactoryUsingInstallers</tt> object
-     * returned by this method should use {@link InstallerLookup} likewise.
-     */
-    protected abstract IsisSessionFactory doCreateSessionFactory(final DeploymentType deploymentType)
-            throws IsisSystemException;
-
-    // ///////////////////////////////////////////
-    // Configuration
-    // ///////////////////////////////////////////
-
-    /**
-     * Populated after {@link #init()}.
-     */
-    public IsisSessionFactory getSessionFactory() {
-        return sessionFactory;
-    }
-
-    // ///////////////////////////////////////////
-    // Configuration
-    // ///////////////////////////////////////////
-
-    public abstract IsisConfiguration getConfiguration();
-
-    // ///////////////////////////////////////////
-    // TemplateImageLoader
-    // ///////////////////////////////////////////
-
-    /**
-     * Just returns a {@link TemplateImageLoaderAwt}; subclasses may override if
-     * required. 
-     */
-    protected TemplateImageLoader obtainTemplateImageLoader() {
-        return new TemplateImageLoaderAwt(getConfiguration());
-    }
-
-    // ///////////////////////////////////////////
-    // Reflector
-    // ///////////////////////////////////////////
-
-    protected abstract ObjectReflector obtainReflector(DeploymentType deploymentType) throws IsisSystemException;
-
-    // ///////////////////////////////////////////
-    // PersistenceSessionFactory
-    // ///////////////////////////////////////////
-
-    protected abstract PersistenceSessionFactory obtainPersistenceSessionFactory(DeploymentType deploymentType)
-            throws IsisSystemException;
-
-    // ///////////////////////////////////////////
-    // Fixtures
-    // ///////////////////////////////////////////
-
-    /**
-     * This is the only {@link Installer} that is used by any (all) subclass implementations, because it
-     * effectively <i>is</i> the component we need (as opposed to a builder/factory of the component we need).
-     * 
-     * <p>
-     * The fact that the component <i>is</i> an installer (and therefore can be {@link InstallerLookup} looked
-     * up} is at this level really just an incidental implementation detail useful for the subclass that uses
-     * {@link InstallerLookup} to create the other components.
-     */
-    protected abstract FixturesInstaller obtainFixturesInstaller() throws IsisSystemException;
-
-    // ///////////////////////////////////////////
-    // Authentication Manager
-    // ///////////////////////////////////////////
-
-    protected abstract AuthenticationManager obtainAuthenticationManager(DeploymentType deploymentType)
-            throws IsisSystemException;
-
-    
-    // ///////////////////////////////////////////
-    // UserProfileLoader
-    // ///////////////////////////////////////////
-
-    protected abstract UserProfileStore obtainUserProfileStore();
-
-    // ///////////////////////////////////////////
-    // Services
-    // ///////////////////////////////////////////
-
-    protected abstract List<Object> obtainServices();
-
-
-    // ///////////////////////////////////////////
-    // Fixtures Installer
-    // ///////////////////////////////////////////
-
-    public FixturesInstaller getFixturesInstaller() {
-        return fixtureInstaller;
-    }
-
-    
-    /**
-     * The {@link LogonFixture}, if any, obtained by running fixtures.
-     * 
-     * <p>
-     * Intended to be used when for {@link DeploymentType#EXPLORATION exploration} (instead
-     * of an {@link ExplorationSession}) or {@link DeploymentType#PROTOTYPE prototype} deployments
-     * (saves logging in).  Should be <i>ignored</i> in other {@link DeploymentType}s.
-     */
-    public LogonFixture getLogonFixture() {
-		return logonFixture;
-	}
-
-    
-
-    // ///////////////////////////////////////////
-    // Splash
-    // ///////////////////////////////////////////
-
-    private void showSplash(TemplateImageLoader imageLoader) {
-    	
-        boolean vetoSplashFromConfig = getConfiguration().getBoolean(SystemConstants.NOSPLASH_KEY, SystemConstants.NOSPLASH_DEFAULT);
-		if (!vetoSplashFromConfig && getDeploymentType().shouldShowSplash()) {
-            splashWindow = new SplashWindow(imageLoader);
-        }
-    }
-
-    private void removeSplash(final int delay) {
-        if (splashWindow != null) {
-            if (delay == 0) {
-                splashWindow.removeImmediately();
-            } else {
-                splashWindow.toFront();
-                splashWindow.removeAfterDelay(delay);
-            }
-        }
-    }
-
-    // ///////////////////////////////////////////
-    // debugging
-    // ///////////////////////////////////////////
-
-    private void debug(final DebugString debug, final Object object) {
-        if (object instanceof DebugInfo) {
-            final DebugInfo d = (DebugInfo) object;
-            debug.appendTitle(d.debugTitle());
-            d.debugData(debug);
-        } else {
-            debug.appendln(object.toString());
-            debug.appendln("... no further debug information");
-        }
-    }
-
-    public DebugInfo debugSection(String selectionName) {
-        //DebugInfo deb;
-        if (selectionName.equals("Configuration")) {
-             return getConfiguration();
-        } /*else if (selectionName.equals("Overview")) {
-            debugOverview(debug);
-        } else  if (selectionName.equals("Authenticator")) {
-            deb = IsisContext.getAuthenticationManager();
-        } else if (selectionName.equals("Reflector")) {
-            deb = IsisContext.getSpecificationLoader();
-        } else if (selectionName.equals("Contexts")) {
-            deb = debugListContexts(debug);
-        } else {
-            deb = debugDisplayContext(selectionName, debug);
-        }*/
-        return null;
-    }
-    
-    private void debugDisplayContext(final String selector, final DebugString debug) {
-        final IsisSession d = IsisContext.getSession(selector);
-        if (d != null) {
-            d.debugAll(debug);
-        } else {
-            debug.appendln("No context: " + selector);
-        }
-    }
-
-    private void debugListContexts(final DebugString debug) {
-        final String[] contextIds = IsisContext.getInstance().allSessionIds();
-        for (int i = 0; i < contextIds.length; i++) {
-            debug.appendln(contextIds[i]);
-            debug.appendln("-----");
-            final IsisSession d = IsisContext.getSession(contextIds[i]);
-            d.debug(debug);
-            debug.appendln();
-        }
-    }
-
-    public String[] debugSectionNames() {
-        final String[] general = new String[] { "Overview", "Authenticator", "Configuration", "Reflector", "Requests",
-                "Contexts" };
-        final String[] contextIds = IsisContext.getInstance().allSessionIds();
-        final String[] combined = new String[general.length + contextIds.length];
-        System.arraycopy(general, 0, combined, 0, general.length);
-        System.arraycopy(contextIds, 0, combined, general.length, contextIds.length);
-        return combined;
-    }
-
-    private void debugOverview(final DebugString debug) {
-        try {
-            debug.appendln(AboutIsis.getFrameworkName());
-            debug.appendln(AboutIsis.getFrameworkVersion());
-            if (AboutIsis.getApplicationName() != null) {
-                debug.appendln("application: " + AboutIsis.getApplicationName());
-            }
-            if (AboutIsis.getApplicationVersion() != null) {
-                debug.appendln("version" + AboutIsis.getApplicationVersion());
-            }
-
-            final String user = System.getProperty("user.name");
-            final String system = System.getProperty("os.name") + " (" + System.getProperty("os.arch") + ") "
-                    + System.getProperty("os.version");
-            final String java = System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version");
-            debug.appendln("user: " + user);
-            debug.appendln("os: " + system);
-            debug.appendln("java: " + java);
-            debug.appendln("working directory: " + new File(".").getAbsolutePath());
-
-            debug.appendTitle("System Installer");
-            debug.appendln("Fixture Installer", fixtureInstaller == null ? "none" : fixtureInstaller.getClass().getName());
-
-            debug.appendTitle("System Components");
-            debug.appendln("Authentication manager", IsisContext.getAuthenticationManager().getClass().getName());
-            debug.appendln("Configuration", getConfiguration().getClass().getName());
-
-            final DebugInfo[] inf = IsisContext.debugSystem();
-            for (int i = 0; i < inf.length; i++) {
-                if (inf[i] != null) {
-                    inf[i].debugData(debug);
-                }
-            }
-        } catch (RuntimeException e) {
-            debug.appendException(e);
-        }
-    }
-
-}
+ */
+public abstract class IsisSystemAbstract implements IsisSystem {
+
+    public static final Logger LOG = Logger.getLogger(IsisSystemAbstract.class);
+
+    private static final int SPLASH_DELAY_DEFAULT = 6;
+
+    private final IsisLocaleInitializer localeInitializer;
+    private final IsisTimeZoneInitializer timeZoneInitializer;
+    private final DeploymentType deploymentType;
+
+    private SplashWindow splashWindow;
+
+    private FixturesInstaller fixtureInstaller;
+
+    private boolean initialized = false;
+
+    private IsisSessionFactory sessionFactory;
+
+    private LogonFixture logonFixture;
+
+    // ///////////////////////////////////////////
+    // Constructors
+    // ///////////////////////////////////////////
+
+    public IsisSystemAbstract(final DeploymentType deploymentType) {
+        this(deploymentType, new IsisLocaleInitializer(), new IsisTimeZoneInitializer());
+    }
+
+    public IsisSystemAbstract(final DeploymentType deploymentType, final IsisLocaleInitializer localeInitializer,
+        final IsisTimeZoneInitializer timeZoneInitializer) {
+        this.deploymentType = deploymentType;
+        this.localeInitializer = localeInitializer;
+        this.timeZoneInitializer = timeZoneInitializer;
+    }
+
+    // ///////////////////////////////////////////
+    // DeploymentType
+    // ///////////////////////////////////////////
+
+    @Override
+    public DeploymentType getDeploymentType() {
+        return deploymentType;
+    }
+
+    // ///////////////////////////////////////////
+    // init, shutdown
+    // ///////////////////////////////////////////
+
+    @Override
+    public void init() {
+
+        if (initialized) {
+            throw new IllegalStateException("Already initialized");
+        } else {
+            initialized = true;
+        }
+
+        LOG.info("initialising Isis System");
+        LOG.info("working directory: " + new File(".").getAbsolutePath());
+        LOG.info("resource stream source: " + getConfiguration().getResourceStreamSource());
+
+        localeInitializer.initLocale(getConfiguration());
+        timeZoneInitializer.initTimeZone(getConfiguration());
+
+        int splashDelay = SPLASH_DELAY_DEFAULT;
+        try {
+            TemplateImageLoader splashLoader = obtainTemplateImageLoader();
+            splashLoader.init();
+            showSplash(splashLoader);
+
+            // temporarily make a configuration available
+            // REVIEW: would rather inject this, or perhaps even the ConfigurationBuilder
+            IsisContext.setConfiguration(getConfiguration());
+
+            sessionFactory = doCreateSessionFactory(deploymentType);
+
+            initContext(sessionFactory);
+            sessionFactory.init();
+
+            installFixturesIfRequired();
+
+        } catch (IsisSystemException ex) {
+            LOG.error("failed to initialise", ex);
+            splashDelay = 0;
+            throw new RuntimeException(ex);
+        } finally {
+            removeSplash(splashDelay);
+        }
+    }
+
+    private void installFixturesIfRequired() throws IsisSystemException {
+        // some deployment types (eg CLIENT) do not support installing fixtures
+        // instead, any fixtures should be installed when server boots up.
+        if (!deploymentType.canInstallFixtures()) {
+            return;
+        }
+
+        fixtureInstaller = obtainFixturesInstaller();
+        if (fixtureInstaller == null || NoopUtils.isNoop(fixtureInstaller)) {
+            return;
+        }
+
+        IsisContext.openSession(new InitialisationSession());
+        fixtureInstaller.installFixtures();
+        try {
+
+            // only allow logon fixtures if not in production mode.
+            if (!deploymentType.isProduction()) {
+                logonFixture = fixtureInstaller.getLogonFixture();
+            }
+        } finally {
+            IsisContext.closeSession();
+        }
+    }
+
+    private void initContext(IsisSessionFactory sessionFactory) {
+        getDeploymentType().initContext(sessionFactory);
+    }
+
+    @Override
+    public void shutdown() {
+        LOG.info("shutting down system");
+        IsisContext.closeAllSessions();
+    }
+
+    // ///////////////////////////////////////////
+    // Hook:
+    // ///////////////////////////////////////////
+
+    /**
+     * Hook method; the returned implementation is expected to use the same general approach as the subclass itself.
+     * 
+     * <p>
+     * So, for example, <tt>IsisSystemUsingInstallers</tt> uses the {@link InstallerLookup} mechanism to find its
+     * components. The corresponding <tt>ExecutionContextFactoryUsingInstallers</tt> object returned by this method
+     * should use {@link InstallerLookup} likewise.
+     */
+    protected abstract IsisSessionFactory doCreateSessionFactory(final DeploymentType deploymentType)
+        throws IsisSystemException;
+
+    // ///////////////////////////////////////////
+    // Configuration
+    // ///////////////////////////////////////////
+
+    /**
+     * Populated after {@link #init()}.
+     */
+    @Override
+    public IsisSessionFactory getSessionFactory() {
+        return sessionFactory;
+    }
+
+    // ///////////////////////////////////////////
+    // Configuration
+    // ///////////////////////////////////////////
+
+    @Override
+    public abstract IsisConfiguration getConfiguration();
+
+    // ///////////////////////////////////////////
+    // TemplateImageLoader
+    // ///////////////////////////////////////////
+
+    /**
+     * Just returns a {@link TemplateImageLoaderAwt}; subclasses may override if required.
+     */
+    protected TemplateImageLoader obtainTemplateImageLoader() {
+        return new TemplateImageLoaderAwt(getConfiguration());
+    }
+
+    // ///////////////////////////////////////////
+    // Reflector
+    // ///////////////////////////////////////////
+
+    protected abstract ObjectReflector obtainReflector(DeploymentType deploymentType) throws IsisSystemException;
+
+    // ///////////////////////////////////////////
+    // PersistenceSessionFactory
+    // ///////////////////////////////////////////
+
+    protected abstract PersistenceSessionFactory obtainPersistenceSessionFactory(DeploymentType deploymentType)
+        throws IsisSystemException;
+
+    // ///////////////////////////////////////////
+    // Fixtures
+    // ///////////////////////////////////////////
+
+    /**
+     * This is the only {@link Installer} that is used by any (all) subclass implementations, because it effectively
+     * <i>is</i> the component we need (as opposed to a builder/factory of the component we need).
+     * 
+     * <p>
+     * The fact that the component <i>is</i> an installer (and therefore can be {@link InstallerLookup} looked up} is at
+     * this level really just an incidental implementation detail useful for the subclass that uses
+     * {@link InstallerLookup} to create the other components.
+     */
+    protected abstract FixturesInstaller obtainFixturesInstaller() throws IsisSystemException;
+
+    // ///////////////////////////////////////////
+    // Authentication Manager
+    // ///////////////////////////////////////////
+
+    protected abstract AuthenticationManager obtainAuthenticationManager(DeploymentType deploymentType)
+        throws IsisSystemException;
+
+    // ///////////////////////////////////////////
+    // UserProfileLoader
+    // ///////////////////////////////////////////
+
+    protected abstract UserProfileStore obtainUserProfileStore();
+
+    // ///////////////////////////////////////////
+    // Services
+    // ///////////////////////////////////////////
+
+    protected abstract List<Object> obtainServices();
+
+    // ///////////////////////////////////////////
+    // Fixtures Installer
+    // ///////////////////////////////////////////
+
+    public FixturesInstaller getFixturesInstaller() {
+        return fixtureInstaller;
+    }
+
+    /**
+     * The {@link LogonFixture}, if any, obtained by running fixtures.
+     * 
+     * <p>
+     * Intended to be used when for {@link DeploymentType#EXPLORATION exploration} (instead of an
+     * {@link ExplorationSession}) or {@link DeploymentType#PROTOTYPE prototype} deployments (saves logging in). Should
+     * be <i>ignored</i> in other {@link DeploymentType}s.
+     */
+    @Override
+    public LogonFixture getLogonFixture() {
+        return logonFixture;
+    }
+
+    // ///////////////////////////////////////////
+    // Splash
+    // ///////////////////////////////////////////
+
+    private void showSplash(TemplateImageLoader imageLoader) {
+
+        boolean vetoSplashFromConfig =
+            getConfiguration().getBoolean(SystemConstants.NOSPLASH_KEY, SystemConstants.NOSPLASH_DEFAULT);
+        if (!vetoSplashFromConfig && getDeploymentType().shouldShowSplash()) {
+            splashWindow = new SplashWindow(imageLoader);
+        }
+    }
+
+    private void removeSplash(final int delay) {
+        if (splashWindow != null) {
+            if (delay == 0) {
+                splashWindow.removeImmediately();
+            } else {
+                splashWindow.toFront();
+                splashWindow.removeAfterDelay(delay);
+            }
+        }
+    }
+
+    // ///////////////////////////////////////////
+    // debugging
+    // ///////////////////////////////////////////
+
+    private void debug(final DebugString debug, final Object object) {
+        if (object instanceof DebugInfo) {
+            final DebugInfo d = (DebugInfo) object;
+            debug.appendTitle(d.debugTitle());
+            d.debugData(debug);
+        } else {
+            debug.appendln(object.toString());
+            debug.appendln("... no further debug information");
+        }
+    }
+
+    @Override
+    public DebugInfo debugSection(String selectionName) {
+        // DebugInfo deb;
+        if (selectionName.equals("Configuration")) {
+            return getConfiguration();
+        } /*
+           * else if (selectionName.equals("Overview")) { debugOverview(debug); } else if
+           * (selectionName.equals("Authenticator")) { deb = IsisContext.getAuthenticationManager(); } else if
+           * (selectionName.equals("Reflector")) { deb = IsisContext.getSpecificationLoader(); } else if
+           * (selectionName.equals("Contexts")) { deb = debugListContexts(debug); } else { deb =
+           * debugDisplayContext(selectionName, debug); }
+           */
+        return null;
+    }
+
+    private void debugDisplayContext(final String selector, final DebugString debug) {
+        final IsisSession d = IsisContext.getSession(selector);
+        if (d != null) {
+            d.debugAll(debug);
+        } else {
+            debug.appendln("No context: " + selector);
+        }
+    }
+
+    private void debugListContexts(final DebugString debug) {
+        final String[] contextIds = IsisContext.getInstance().allSessionIds();
+        for (int i = 0; i < contextIds.length; i++) {
+            debug.appendln(contextIds[i]);
+            debug.appendln("-----");
+            final IsisSession d = IsisContext.getSession(contextIds[i]);
+            d.debug(debug);
+            debug.appendln();
+        }
+    }
+
+    @Override
+    public String[] debugSectionNames() {
+        final String[] general =
+            new String[] { "Overview", "Authenticator", "Configuration", "Reflector", "Requests", "Contexts" };
+        final String[] contextIds = IsisContext.getInstance().allSessionIds();
+        final String[] combined = new String[general.length + contextIds.length];
+        System.arraycopy(general, 0, combined, 0, general.length);
+        System.arraycopy(contextIds, 0, combined, general.length, contextIds.length);
+        return combined;
+    }
+
+    private void debugOverview(final DebugString debug) {
+        try {
+            debug.appendln(AboutIsis.getFrameworkName());
+            debug.appendln(AboutIsis.getFrameworkVersion());
+            if (AboutIsis.getApplicationName() != null) {
+                debug.appendln("application: " + AboutIsis.getApplicationName());
+            }
+            if (AboutIsis.getApplicationVersion() != null) {
+                debug.appendln("version" + AboutIsis.getApplicationVersion());
+            }
+
+            final String user = System.getProperty("user.name");
+            final String system =
+                System.getProperty("os.name") + " (" + System.getProperty("os.arch") + ") "
+                    + System.getProperty("os.version");
+            final String java = System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version");
+            debug.appendln("user: " + user);
+            debug.appendln("os: " + system);
+            debug.appendln("java: " + java);
+            debug.appendln("working directory: " + new File(".").getAbsolutePath());
+
+            debug.appendTitle("System Installer");
+            debug.appendln("Fixture Installer", fixtureInstaller == null ? "none" : fixtureInstaller.getClass()
+                .getName());
+
+            debug.appendTitle("System Components");
+            debug.appendln("Authentication manager", IsisContext.getAuthenticationManager().getClass().getName());
+            debug.appendln("Configuration", getConfiguration().getClass().getName());
+
+            final DebugInfo[] inf = IsisContext.debugSystem();
+            for (int i = 0; i < inf.length; i++) {
+                if (inf[i] != null) {
+                    inf[i].debugData(debug);
+                }
+            }
+        } catch (RuntimeException e) {
+            debug.appendException(e);
+        }
+    }
+
+}

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/SplashWindow.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/SplashWindow.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/SplashWindow.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/SplashWindow.java Wed Nov  3 01:24:18 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtime.system.internal;
 
 import java.awt.Color;
@@ -29,17 +28,16 @@ import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.Window;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.commons.exceptions.IsisException;
 import org.apache.isis.runtime.about.AboutIsis;
 import org.apache.isis.runtime.imageloader.TemplateImage;
 import org.apache.isis.runtime.imageloader.TemplateImageLoader;
-
+import org.apache.log4j.Logger;
 
 public class SplashWindow extends Window implements Runnable {
     private static final long serialVersionUID = 1L;
     final static Logger LOG = Logger.getLogger(SplashWindow.class);
-    private static final String LOGO_TEXT = "[[NAME]]";
+    private static final String LOGO_TEXT = "Apache Isis";
 
     private int delay;
     private final Font textFont;
@@ -98,7 +96,7 @@ public class SplashWindow extends Window
         setupCenterLocation();
 
         setVisible(true);
-      //  toFront();
+        // toFront();
     }
 
     private void setupCenterLocation() {
@@ -210,10 +208,12 @@ public class SplashWindow extends Window
         parent.dispose();
     }
 
+    @Override
     public void run() {
         try {
             Thread.sleep(delay);
-        } catch (final InterruptedException e) {}
+        } catch (final InterruptedException e) {
+        }
 
         removeImmediately();
     }

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/AWTConsole.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/AWTConsole.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/AWTConsole.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/AWTConsole.java Wed Nov  3 01:24:18 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtime.system.internal.console;
 
 import java.awt.BorderLayout;
@@ -32,12 +31,11 @@ import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.runtime.context.IsisContext;
+import org.apache.log4j.Logger;
 
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 
-
 public class AWTConsole extends Frame implements ServerConsole {
     private static final long serialVersionUID = 1L;
     private final static Logger LOG = Logger.getLogger(AWTConsole.class);
@@ -68,6 +66,7 @@ public class AWTConsole extends Frame im
 
         p.add(b = new Button("Blank"));
         b.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(final ActionEvent e) {
                 clearLog();
             }
@@ -76,6 +75,7 @@ public class AWTConsole extends Frame im
         // debug
         p.add(b = new Button("Classes"));
         b.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(final ActionEvent e) {
                 listClasses();
             }
@@ -83,6 +83,7 @@ public class AWTConsole extends Frame im
 
         p.add(b = new Button("Cache"));
         b.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(final ActionEvent e) {
                 listCachedObjects();
             }
@@ -90,6 +91,7 @@ public class AWTConsole extends Frame im
 
         p.add(b = new Button("C/Cache"));
         b.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(final ActionEvent e) {
                 clearCache();
             }
@@ -98,6 +100,7 @@ public class AWTConsole extends Frame im
         // quit
         p.add(quit = new Button("Quit"));
         quit.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(final ActionEvent e) {
                 quit();
             }
@@ -123,10 +126,11 @@ public class AWTConsole extends Frame im
         setBounds(bounds);
     }
 
-    private void clearCache() {}
+    private void clearCache() {
+    }
 
     /**
-     *
+     * 
      * @param message
      *            java.lang.String
      */
@@ -137,43 +141,47 @@ public class AWTConsole extends Frame im
     /**
      *
      */
+    @Override
     public void close() {
         dispose();
     }
 
+    @Override
     public void init(final Server server) {
         this.server = server;
         log("Console in control of " + server);
     }
 
     private void listCachedObjects() {
-    /*
-     * Enumeration e = server.getObjectStore().cache();
-     *
-     * log("Cached objects:-"); while (e.hasMoreElements()) { ObjectAdapter object = (ObjectAdapter)
-     * e.nextElement();
-     *
-     * log(" " + object.getClassName() + "[" + (object.isResolved() ? "" : "~") + object.getOid() + "] " +
-     * object.title()); } log();
-     */
+        /*
+         * Enumeration e = server.getObjectStore().cache();
+         * 
+         * log("Cached objects:-"); while (e.hasMoreElements()) { ObjectAdapter object = (ObjectAdapter)
+         * e.nextElement();
+         * 
+         * log(" " + object.getClassName() + "[" + (object.isResolved() ? "" : "~") + object.getOid() + "] " +
+         * object.title()); } log();
+         */
     }
 
     private void listClasses() {
-    /*
-     * try { Enumeration e = server.getObjectStore().classes();
-     *
-     * log("Loaded classes:-"); while (e.hasMoreElements()) { [[NAME]]Class object = ([[NAME]]Class)
-     * e.nextElement();
-     *
-     * log(" " + object); } log(); } catch (ObjectStoreException e) { LOG.error("Error listing classes " +
-     * e.getMessage()); }
-     */
+        /*
+         * try { Enumeration e = server.getObjectStore().classes();
+         * 
+         * log("Loaded classes:-"); while (e.hasMoreElements()) { ObjectSpecification object = (ObjectSpecification)
+         * e.nextElement();
+         * 
+         * log(" " + object); } log(); } catch (ObjectStoreException e) { LOG.error("Error listing classes " +
+         * e.getMessage()); }
+         */
     }
 
+    @Override
     public void log() {
         log.append("\n");
     }
 
+    @Override
     public void log(final String message) {
         log.append(message + '\n');
         LOG.info(message);
@@ -188,9 +196,8 @@ public class AWTConsole extends Frame im
         exitSystem();
     }
 
-    @SuppressWarnings(value="DM_EXIT")
+    @SuppressWarnings(value = "DM_EXIT")
     private void exitSystem() {
         System.exit(0);
     }
 }
-

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/TerminalConsole.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/TerminalConsole.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/TerminalConsole.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/TerminalConsole.java Wed Nov  3 01:24:18 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtime.system.internal.console;
 
 import java.io.BufferedReader;
@@ -28,7 +27,6 @@ import org.apache.log4j.Logger;
 
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 
-
 /**
  * Marked as final because starts a thread in the {@link #TerminalConsole() constructor}.
  */
@@ -41,41 +39,48 @@ public final class TerminalConsole imple
         new Thread(this).start();
     }
 
-    public void clear() {}
+    public void clear() {
+    }
 
+    @Override
     public void close() {
         running = false;
     }
 
-    public void collections() {}
+    public void collections() {
+    }
 
+    @Override
     public void init(final Server server) {
         this.server = server;
         log("Control of " + server);
     }
 
     public void listClasses() {
-    /*
-     * try { Enumeration e = server.getObjectStore().classes();
-     *
-     * log("Loaded classes:-"); while (e.hasMoreElements()) { [[NAME]]Class object = ([[NAME]]Class)
-     * e.nextElement();
-     *
-     * log(" " + object); } } catch (ObjectStoreException e) { LOG.error("Error listing classes " +
-     * e.getMessage()); }
-     */
+        /*
+         * try { Enumeration e = server.getObjectStore().classes();
+         * 
+         * log("Loaded classes:-"); while (e.hasMoreElements()) { ObjectSpecification object = (ObjectSpecification)
+         * e.nextElement();
+         * 
+         * log(" " + object); } } catch (ObjectStoreException e) { LOG.error("Error listing classes " + e.getMessage());
+         * }
+         */
     }
 
+    @Override
     public void log() {
         log("");
     }
 
+    @Override
     public void log(final String message) {
         LOG.info(message);
         System.out.println("> " + message);
     }
 
-    public void objects() {}
+    public void objects() {
+    }
 
     public void quit() {
         server.shutdown();
@@ -83,6 +88,7 @@ public final class TerminalConsole imple
         running = false;
     }
 
+    @Override
     public void run() {
         final BufferedReader dis = new BufferedReader(new InputStreamReader(System.in));
 
@@ -111,8 +117,7 @@ public final class TerminalConsole imple
         exitSystem();
     }
 
-
-    @SuppressWarnings(value="DM_EXIT")
+    @SuppressWarnings(value = "DM_EXIT")
     private void exitSystem() {
         System.exit(0);
     }
@@ -121,5 +126,3 @@ public final class TerminalConsole imple
         new Thread(this).start();
     }
 }
-
-

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/SystemPrinter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/SystemPrinter.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/SystemPrinter.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/SystemPrinter.java Wed Nov  3 01:24:18 2010
@@ -17,132 +17,132 @@
  *  under the License.
  */
 
+package org.apache.isis.runtime.system.internal.monitor;
 
-package org.apache.isis.runtime.system.internal.monitor;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.io.LineNumberReader;
-import java.io.PrintStream;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.TimeZone;
-
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.io.IoUtils;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FilenameFilter;
+import java.io.LineNumberReader;
+import java.io.PrintStream;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.TimeZone;
+
+import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.io.IoUtils;
 import org.apache.isis.runtime.about.AboutIsis;
-
-
-public class SystemPrinter {
-
-    private PrintStream output;
-
-    public SystemPrinter() {
-        this(System.out);
-    }
-
-    public SystemPrinter(final PrintStream output) {
-        this.output = output;
-    }
-
-    protected PrintStream getOutput() {
-        return output;
-    }
-
-    void print(final String string) {
-        output.println(string);
-    }
-
-    void printBlock(final String title) {
-        print("");
-        print("------------------------------------------");
-        print(title);
-        print("------------------------------------------");
-    }
-
-    public void printDiagnostics() {
-        print("------- [[NAME]] diagnostics report -------");
-        printVersion();
-
-        printBlock("System properties");
-        final Properties properties = System.getProperties();
-        final Enumeration<?> propertyNames = properties.propertyNames();
-        while (propertyNames.hasMoreElements()) {
-            final String name = (String) propertyNames.nextElement();
-            final String property = properties.getProperty(name);
-            final StringBuilder buf = new StringBuilder();
-            if (name.endsWith(".path") || name.endsWith(".dirs")) {
-                String[] split = property.split(":");
-                buf.append(split[0]);
-                for (int i = 1; i < split.length; i++) {
-                    buf.append("\n\t\t" + split[i]);
-                }
-            }
-            print(name + "= " + buf.toString());
-        }
-
-        File file = new File("../lib");
-        if (file.isDirectory()) {
-            final String[] files = file.list(new FilenameFilter() {
-                public boolean accept(File dir, String name) {
-                    return name.endsWith(".jar");
-                }
-            });
-            printBlock("Libs");
-            for (int i = 0; i < files.length; i++) {
-                print(files[i]);
-            }
-        }
-
-        printBlock("Locale information");
-        print("Default locale: " + Locale.getDefault());
-        print("Default timezone: " + TimeZone.getDefault());
-
-        file = new File("config");
-        if (file.isDirectory()) {
-            final String[] files = file.list(new FilenameFilter() {
-                public boolean accept(File dir, String name) {
-                    return new File(dir, name).isFile();
-                }
-            });
-            printBlock("Config files");
-            for (int i = 0; i < files.length; i++) {
-                print(files[i]);
-            }
-
-            for (int i = 0; i < files.length; i++) {
-                print("");
-                print("--------------------------------------------------------------------------------------------------------");
-                print(files[i]);
-                print("");
-                LineNumberReader fileInputStream = null;
-                try {
-                    fileInputStream = new LineNumberReader(new FileReader(new File(file, files[i])));
-                    String line;
-                    while ((line = fileInputStream.readLine()) != null) {
-                        print(fileInputStream.getLineNumber() + "  " + line);
-                    }
-                } catch (Exception e) {
-                    throw new IsisException(e);
-                } finally {
-                    IoUtils.closeSafely(fileInputStream);
-                }
-                print("");
-            }
-
-        }
-    }
-
-    public void printVersion() {
-        final String date = AboutIsis.getFrameworkCompileDate();
-        final String compileDate = date == null ? "" : ", compiled on " + date;
-        print(AboutIsis.getFrameworkName() + ", " + AboutIsis.getFrameworkVersion() + compileDate);
-    }
-
-    public void printErrorMessage(String message) {
-        output.println("Error: " + message);
-    }
-
-}
+
+public class SystemPrinter {
+
+    private final PrintStream output;
+
+    public SystemPrinter() {
+        this(System.out);
+    }
+
+    public SystemPrinter(final PrintStream output) {
+        this.output = output;
+    }
+
+    protected PrintStream getOutput() {
+        return output;
+    }
+
+    void print(final String string) {
+        output.println(string);
+    }
+
+    void printBlock(final String title) {
+        print("");
+        print("------------------------------------------");
+        print(title);
+        print("------------------------------------------");
+    }
+
+    public void printDiagnostics() {
+        print("------- Apache Isis diagnostics report -------");
+        printVersion();
+
+        printBlock("System properties");
+        final Properties properties = System.getProperties();
+        final Enumeration<?> propertyNames = properties.propertyNames();
+        while (propertyNames.hasMoreElements()) {
+            final String name = (String) propertyNames.nextElement();
+            final String property = properties.getProperty(name);
+            final StringBuilder buf = new StringBuilder();
+            if (name.endsWith(".path") || name.endsWith(".dirs")) {
+                String[] split = property.split(":");
+                buf.append(split[0]);
+                for (int i = 1; i < split.length; i++) {
+                    buf.append("\n\t\t" + split[i]);
+                }
+            }
+            print(name + "= " + buf.toString());
+        }
+
+        File file = new File("../lib");
+        if (file.isDirectory()) {
+            final String[] files = file.list(new FilenameFilter() {
+                @Override
+                public boolean accept(File dir, String name) {
+                    return name.endsWith(".jar");
+                }
+            });
+            printBlock("Libs");
+            for (int i = 0; i < files.length; i++) {
+                print(files[i]);
+            }
+        }
+
+        printBlock("Locale information");
+        print("Default locale: " + Locale.getDefault());
+        print("Default timezone: " + TimeZone.getDefault());
+
+        file = new File("config");
+        if (file.isDirectory()) {
+            final String[] files = file.list(new FilenameFilter() {
+                @Override
+                public boolean accept(File dir, String name) {
+                    return new File(dir, name).isFile();
+                }
+            });
+            printBlock("Config files");
+            for (int i = 0; i < files.length; i++) {
+                print(files[i]);
+            }
+
+            for (int i = 0; i < files.length; i++) {
+                print("");
+                print("--------------------------------------------------------------------------------------------------------");
+                print(files[i]);
+                print("");
+                LineNumberReader fileInputStream = null;
+                try {
+                    fileInputStream = new LineNumberReader(new FileReader(new File(file, files[i])));
+                    String line;
+                    while ((line = fileInputStream.readLine()) != null) {
+                        print(fileInputStream.getLineNumber() + "  " + line);
+                    }
+                } catch (Exception e) {
+                    throw new IsisException(e);
+                } finally {
+                    IoUtils.closeSafely(fileInputStream);
+                }
+                print("");
+            }
+
+        }
+    }
+
+    public void printVersion() {
+        final String date = AboutIsis.getFrameworkCompileDate();
+        final String compileDate = date == null ? "" : ", compiled on " + date;
+        print(AboutIsis.getFrameworkName() + ", " + AboutIsis.getFrameworkVersion() + compileDate);
+    }
+
+    public void printErrorMessage(String message) {
+        output.println("Error: " + message);
+    }
+
+}

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoaderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoaderDefault.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoaderDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoaderDefault.java Wed Nov  3 01:24:18 2010
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtime.userprofile;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.commons.debug.DebugInfo;
 import org.apache.isis.commons.debug.DebugString;
 import org.apache.isis.commons.exceptions.IsisException;
@@ -31,42 +29,39 @@ import org.apache.isis.metamodel.authent
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.session.IsisSession;
+import org.apache.log4j.Logger;
 
 /**
  * Acts like a bridge, loading the profile from the underlying store.
  */
 public class UserProfileLoaderDefault implements UserProfileLoader, DebugInfo {
-	
-    private static final String DEFAULT_PERSPECTIVE_NAME = "[[NAME]]";
-    private static final String EXPLORATION =  " Exploration";
 
-	private Logger LOG = Logger.getLogger(UserProfile.class);
+    private static final String DEFAULT_PERSPECTIVE_NAME = "Apache Isis";
+    private static final String EXPLORATION = " Exploration";
+
+    private final Logger LOG = Logger.getLogger(UserProfile.class);
 
     public static enum Mode {
-    	/**
-    	 * Must provide some services.
-    	 */
-    	STRICT,
-    	/**
-    	 * For testing only, no services is okay.
-    	 */
-    	RELAXED
+        /**
+         * Must provide some services.
+         */
+        STRICT,
+        /**
+         * For testing only, no services is okay.
+         */
+        RELAXED
     }
-    
 
     private final UserProfileStore store;
     private final Mode mode;
-    
-    private UserProfile userProfile;
-
-	private List<Object> serviceList;
 
+    private UserProfile userProfile;
 
+    private List<Object> serviceList;
 
-    
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // Constructor
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
     public UserProfileLoaderDefault(final UserProfileStore store) {
         this(store, Mode.STRICT);
@@ -80,51 +75,55 @@ public class UserProfileLoaderDefault im
         this.mode = mode;
     }
 
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // init, shutdown
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
+
+    /**
+     * Does nothing.
+     */
+    @Override
+    public void init() {
+    }
 
-	/**
-	 * Does nothing.
-	 */
-	public void init() {
-	}
-
-
-	/**
-	 * Does nothing.
-	 */
-	public void shutdown() {
-	}
+    /**
+     * Does nothing.
+     */
+    @Override
+    public void shutdown() {
+    }
 
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // Fixtures
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
     /**
      * @see PersistenceSession#isFixturesInstalled()
      */
+    @Override
     public boolean isFixturesInstalled() {
-        return store.isFixturesInstalled(); 
+        return store.isFixturesInstalled();
     }
 
-
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // saveAs...
-    ////////////////////////////////////////////////////////
-    
+    // //////////////////////////////////////////////////////
+
+    @Override
     public void saveAsDefault(UserProfile userProfile) {
         store.save("_default", userProfile);
     }
 
+    @Override
     public void saveForUser(String userName, UserProfile userProfile) {
         store.save(userName, userProfile);
     }
 
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // saveSession
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
+    @Override
     public void saveSession(List<ObjectAdapter> objects) {
         loadOrCreateProfile();
         userProfile.saveObjects(objects);
@@ -135,51 +134,50 @@ public class UserProfileLoaderDefault im
         saveForUser(userName(), userProfile);
     }
 
-    
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // getProfile
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
+    @Override
     public UserProfile getProfile(AuthenticationSession session) {
         String userName = session.getUserName();
         UserProfile profile = store.getUserProfile(userName);
-        userProfile =  profile != null ? profile : createUserProfile(userName);
+        userProfile = profile != null ? profile : createUserProfile(userName);
         return userProfile;
     }
 
+    @Override
     @Deprecated
     public UserProfile getProfile() {
         loadOrCreateProfile();
         return userProfile;
     }
 
-    
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // Helpers: (for getProfile)
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
     private void loadOrCreateProfile() {
         if (userProfile == null) {
             String userName = userName();
             UserProfile profile = store.getUserProfile(userName);
-            userProfile =  profile != null ? profile : createUserProfile(userName);
+            userProfile = profile != null ? profile : createUserProfile(userName);
         }
     }
 
-
     private UserProfile createUserProfile(String userName) {
         UserProfile template = store.getUserProfile("_default");
-		if (template == null) {
-			return createDefaultProfile(userName);
-		} else {
-			return createProfileFromTemplate(userName, template);
-		}
+        if (template == null) {
+            return createDefaultProfile(userName);
+        } else {
+            return createProfileFromTemplate(userName, template);
+        }
     }
-    
 
     private UserProfile createDefaultProfile(String userName) {
         UserProfile profile = new UserProfile();
-        profile.newPerspective(DEFAULT_PERSPECTIVE_NAME + (IsisContext.getDeploymentType().isExploring() ? EXPLORATION : ""));
+        profile.newPerspective(DEFAULT_PERSPECTIVE_NAME
+            + (IsisContext.getDeploymentType().isExploring() ? EXPLORATION : ""));
 
         List<Object> services = getServices();
         if (services.size() == 0 && mode == Mode.STRICT) {
@@ -192,7 +190,6 @@ public class UserProfileLoaderDefault im
         return profile;
     }
 
-
     private UserProfile createProfileFromTemplate(String userName, UserProfile template) {
         UserProfile userProfile = new UserProfile();
         userProfile.copy(template);
@@ -200,54 +197,52 @@ public class UserProfileLoaderDefault im
         return userProfile;
     }
 
-    
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // Debugging
-    ////////////////////////////////////////////////////////
-    
+    // //////////////////////////////////////////////////////
+
+    @Override
     public void debugData(DebugString debug) {
         debug.appendln("Store", store.toString());
         debug.appendln("Mode", mode);
-        
+
         debug.append(store);
         debug.append(userProfile);
     }
 
+    @Override
     public String debugTitle() {
         return "User Profile Service";
     }
 
-
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // Dependencies (injected via setters)
-    ////////////////////////////////////////////////////////
-	
-	public List<Object> getServices() {
-		return serviceList;
-	}
-
-	public void setServices(List<Object> serviceList) {
-		this.serviceList = serviceList;
-	}
+    // //////////////////////////////////////////////////////
+
+    @Override
+    public List<Object> getServices() {
+        return serviceList;
+    }
 
-    ////////////////////////////////////////////////////////
+    @Override
+    public void setServices(List<Object> serviceList) {
+        this.serviceList = serviceList;
+    }
+
+    // //////////////////////////////////////////////////////
     // Dependencies (from context)
-    ////////////////////////////////////////////////////////
-	
-	private static AuthenticationSession getAuthenticationSession() {
-		return getSession().getAuthenticationSession();
-	}
+    // //////////////////////////////////////////////////////
+
+    private static AuthenticationSession getAuthenticationSession() {
+        return getSession().getAuthenticationSession();
+    }
 
     private static String userName() {
         return getAuthenticationSession().getUserName();
     }
 
-	private static IsisSession getSession() {
-		return IsisContext.getSession();
-	}
-
-	
+    private static IsisSession getSession() {
+        return IsisContext.getSession();
+    }
 
 }
-
-

Added: incubator/isis/trunk/core/runtime/src/main/resources/images/nof-small-logo.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/resources/images/nof-small-logo.png?rev=1030308&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/core/runtime/src/main/resources/images/nof-small-logo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/isis/trunk/core/runtime/src/main/resources/images/nof-splash-logo.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/resources/images/nof-splash-logo.png?rev=1030308&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/core/runtime/src/main/resources/images/nof-splash-logo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/isis/trunk/core/runtime/src/main/resources/images/powered-by.pdn
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/resources/images/powered-by.pdn?rev=1030308&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/core/runtime/src/main/resources/images/powered-by.pdn
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/isis/trunk/core/runtime/src/main/resources/images/poweredby-logo.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/resources/images/poweredby-logo.png?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/isis/trunk/core/runtime/src/main/resources/images/small-logo.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/resources/images/small-logo.png?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/isis/trunk/core/runtime/src/main/resources/images/splash-logo.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/resources/images/splash-logo.png?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyAction.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyAction.java (original)
+++ incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyAction.java Wed Nov  3 01:24:18 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.nof.reflect.remote.spec;
 
-import org.apache.isis.noa.adapter.[[NAME]];
-import org.apache.isis.noa.adapter.[[NAME]]Reference;
+import org.apache.isis.noa.adapter.ObjectAdapter;
+import org.apache.isis.noa.adapter.ObjectAdapterReference;
 import org.apache.isis.noa.facets.Facet;
 import org.apache.isis.metamodel.facets.actions.debug.DebugFacet;
 import org.apache.isis.metamodel.facets.actions.executed.ExecutedFacet;
@@ -57,7 +57,7 @@ public class DummyAction implements Obje
 		return "";
 	}
 
-	public [[NAME]] execute(final [[NAME]]Reference object, final [[NAME]][] parameters) {
+	public ObjectAdapter execute(final ObjectAdapterReference object, final ObjectAdapter[] parameters) {
 		return peer.execute(object, parameters);
 	}
 
@@ -65,7 +65,7 @@ public class DummyAction implements Obje
 		return new ObjectAction[0];
 	}
 
-	public [[NAME]][] getDefaultParameterValues([[NAME]]Reference target) {
+	public ObjectAdapter[] getDefaultParameterValues(ObjectAdapterReference target) {
 		throw new NotImplementedException();
 	}
 
@@ -111,7 +111,7 @@ public class DummyAction implements Obje
         return peer.getOnType();
     }
 
-	public [[NAME]][][] getOptions([[NAME]]Reference target) {
+	public ObjectAdapter[][] getOptions(ObjectAdapterReference target) {
 		return null;
 	}
 
@@ -242,12 +242,12 @@ public class DummyAction implements Obje
 	}
 
     /**
-     * Delegates to {@link #isParameterSetValidDeclaratively([[NAME]]Reference, [[NAME]][])} and
-     * then {@link #isParameterSetValidImperatively([[NAME]]Reference, [[NAME]][])}, as per the
+     * Delegates to {@link #isParameterSetValidDeclaratively(ObjectAdapterReference, ObjectAdapter[])} and
+     * then {@link #isParameterSetValidImperatively(ObjectAdapterReference, ObjectAdapter[])}, as per the
      * contract in the {@link ObjectAction implemented interface}.
      */
-	public Consent isParameterSetValid(final [[NAME]]Reference object,
-			final [[NAME]][] parameters) {
+	public Consent isParameterSetValid(final ObjectAdapterReference object,
+			final ObjectAdapter[] parameters) {
 	    Consent consentDeclaratively = isParameterSetValidDeclaratively(object, parameters);
         if (consentDeclaratively.isVetoed()) {
             return consentDeclaratively;
@@ -259,18 +259,18 @@ public class DummyAction implements Obje
      * Always returns an {@link Allow}.
      */
     public Consent isParameterSetValidDeclaratively(
-            [[NAME]]Reference object,
-            [[NAME]][] parameters) {
+        ObjectAdapterReference object,
+        ObjectAdapter[] parameters) {
         return Allow.DEFAULT;
     }
 
     public Consent isParameterSetValidImperatively(
-            [[NAME]]Reference object,
-            [[NAME]][] parameters) {
+        ObjectAdapterReference object,
+        ObjectAdapter[] parameters) {
         return peer.isParameterSetValidImperatively(object, parameters);
     }
 
-    public Consent isUsable(final [[NAME]]Reference target) {
+    public Consent isUsable(final ObjectAdapterReference target) {
 		return peer.isUsable(target);
 	}
 
@@ -306,15 +306,15 @@ public class DummyAction implements Obje
         return peer.isVisibleForSession(new TestSession());
     }
 
-    public boolean isVisible(final [[NAME]]Reference target) {
+    public boolean isVisible(final ObjectAdapterReference target) {
 		return peer.isVisible(target);
 	}
 
-    public [[NAME]][] parameterStubs() {
+    public ObjectAdapter[] parameterStubs() {
 		throw new NotImplementedException();
 	}
     
-    public [[NAME]]Reference realTarget([[NAME]]Reference target) {
+    public ObjectAdapterReference realTarget(ObjectAdapterReference target) {
         return target;
     }
 

Modified: incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToManyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToManyAssociation.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToManyAssociation.java (original)
+++ incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToManyAssociation.java Wed Nov  3 01:24:18 2010
@@ -20,9 +20,8 @@
 
 package org.apache.isis.nof.reflect.remote.spec;
 
-import org.apache.isis.noa.adapter.[[NAME]];
 import org.apache.isis.noa.adapter.ObjectAdapter;
-import org.apache.isis.noa.adapter.[[NAME]]Reference;
+import org.apache.isis.noa.adapter.ObjectAdapterReference;
 import org.apache.isis.noa.facets.Facet;
 import org.apache.isis.noa.reflect.Consent;
 import org.apache.isis.noa.reflect.ObjectField;
@@ -79,7 +78,7 @@ public class DummyOneToManyAssociation i
         return false;
     }
     
-    public [[NAME]] get(final ObjectAdapter fromObject) {
+    public ObjectAdapter get(final ObjectAdapter fromObject) {
         return null;
     }
 
@@ -122,7 +121,7 @@ public class DummyOneToManyAssociation i
         return null;
     }
 
-    public [[NAME]][] getOptions(final ObjectAdapter target) {
+    public ObjectAdapter[] getOptions(final ObjectAdapter target) {
         return null;
     }
     
@@ -142,7 +141,7 @@ public class DummyOneToManyAssociation i
         return Allow.DEFAULT;
     }
 
-    public Consent isUsable(final [[NAME]]Reference target) {
+    public Consent isUsable(final ObjectAdapterReference target) {
         return null;
     }
 
@@ -158,7 +157,7 @@ public class DummyOneToManyAssociation i
         return false;
     }
 
-    public boolean isVisible(final [[NAME]]Reference target) {
+    public boolean isVisible(final ObjectAdapterReference target) {
         return true;
     }
 

Modified: incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToOneAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToOneAssociation.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToOneAssociation.java (original)
+++ incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToOneAssociation.java Wed Nov  3 01:24:18 2010
@@ -20,9 +20,8 @@
 
 package org.apache.isis.nof.reflect.remote.spec;
 
-import org.apache.isis.noa.adapter.[[NAME]];
 import org.apache.isis.noa.adapter.ObjectAdapter;
-import org.apache.isis.noa.adapter.[[NAME]]Reference;
+import org.apache.isis.noa.adapter.ObjectAdapterReference;
 import org.apache.isis.noa.facets.Facet;
 import org.apache.isis.noa.reflect.Consent;
 import org.apache.isis.noa.reflect.ObjectField;
@@ -51,7 +50,7 @@ public class DummyOneToOneAssociation im
     public void toDefault(ObjectAdapter target) {
     }
     
-    public [[NAME]][] getOptions(final ObjectAdapter target) {
+    public ObjectAdapter[] getOptions(final ObjectAdapter target) {
         return null;
     }
 
@@ -92,7 +91,7 @@ public class DummyOneToOneAssociation im
     }
 
 
-    public [[NAME]] get(final ObjectAdapter fromObject) {
+    public ObjectAdapter get(final ObjectAdapter fromObject) {
         return null;
     }
 
@@ -146,7 +145,7 @@ public class DummyOneToOneAssociation im
         return Allow.DEFAULT;
     }
 
-    public Consent isUsable(final [[NAME]]Reference target) {
+    public Consent isUsable(final ObjectAdapterReference target) {
         return null;
     }
 
@@ -162,7 +161,7 @@ public class DummyOneToOneAssociation im
         return false;
     }
 
-    public boolean isVisible(final [[NAME]]Reference target) {
+    public boolean isVisible(final ObjectAdapterReference target) {
         return true;
     }
     

Modified: incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyValueAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyValueAssociation.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyValueAssociation.java (original)
+++ incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyValueAssociation.java Wed Nov  3 01:24:18 2010
@@ -20,9 +20,8 @@
 
 package org.apache.isis.nof.reflect.remote.spec;
 
-import org.apache.isis.noa.adapter.[[NAME]];
 import org.apache.isis.noa.adapter.ObjectAdapter;
-import org.apache.isis.noa.adapter.[[NAME]]Reference;
+import org.apache.isis.noa.adapter.ObjectAdapterReference;
 import org.apache.isis.noa.facets.Facet;
 import org.apache.isis.noa.reflect.Consent;
 import org.apache.isis.noa.reflect.ObjectField;
@@ -55,7 +54,7 @@ public class DummyValueAssociation imple
     public void toDefault(ObjectAdapter target) {
     }
         
-    public [[NAME]][] getOptions(final ObjectAdapter target) {
+    public ObjectAdapter[] getOptions(final ObjectAdapter target) {
         return null;
     }
     
@@ -88,7 +87,7 @@ public class DummyValueAssociation imple
     }
 
 
-    public [[NAME]] get(final ObjectAdapter fromObject) {
+    public ObjectAdapter get(final ObjectAdapter fromObject) {
         return null;
     }
 
@@ -146,11 +145,11 @@ public class DummyValueAssociation imple
         return Allow.DEFAULT;
     }
 
-    public Consent isUsable(final [[NAME]]Reference target) {
+    public Consent isUsable(final ObjectAdapterReference target) {
         return null;
     }
 
-    public boolean isVisible(final [[NAME]]Reference target) {
+    public boolean isVisible(final ObjectAdapterReference target) {
         return true;
     }
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAdapter.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAdapter.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAdapter.java Wed Nov  3 01:24:18 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtime.testsystem;
 
 import java.util.Hashtable;
@@ -37,7 +36,6 @@ import org.apache.isis.metamodel.spec.fe
 import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.runtime.persistence.ConcurrencyException;
 
-
 public class TestProxyAdapter implements ObjectAdapter {
     private final Hashtable fieldContents = new Hashtable();
     private Object object;
@@ -50,6 +48,7 @@ public class TestProxyAdapter implements
     private final int id = next++;
     private String iconName;
 
+    @Override
     public void checkLock(final Version version) {
         if (this.version.different(version)) {
             throw new ConcurrencyException("", getOid());
@@ -60,39 +59,47 @@ public class TestProxyAdapter implements
         return (ObjectAdapter) fieldContents.get(field.getId());
     }
 
+    @Override
     public String getIconName() {
         return iconName;
     }
 
+    @Override
     public Object getObject() {
         return object;
     }
 
+    @Override
     public Oid getOid() {
         return oid;
     }
 
+    @Override
     public ResolveState getResolveState() {
         return state;
     }
 
+    @Override
+    public boolean isPersistent() {
+        return getResolveState().isPersistent();
+    }
 
-	public boolean isPersistent() {
-		return getResolveState().isPersistent();
-	}
-
-	public boolean isTransient() {
-		return getResolveState().isTransient();
-	}
+    @Override
+    public boolean isTransient() {
+        return getResolveState().isTransient();
+    }
 
+    @Override
     public ObjectSpecification getSpecification() {
         return spec;
     }
 
+    @Override
     public Version getVersion() {
         return version;
     }
 
+    @Override
     public void setOptimisticLock(final Version version) {
         this.version = version;
     }
@@ -107,7 +114,7 @@ public class TestProxyAdapter implements
 
     public void setupObject(final Object object) {
         if (object instanceof ObjectAdapter) {
-            throw new IsisException("can't create a [[NAME]] for a [[NAME]]: " + object.toString());
+            throw new IsisException("can't create an ObjectAdapter for an ObjectAdapter: " + object.toString());
         }
         this.object = object;
     }
@@ -132,8 +139,10 @@ public class TestProxyAdapter implements
         this.version = version;
     }
 
-    public void setValue(final OneToOneAssociation field, final Object object) {}
+    public void setValue(final OneToOneAssociation field, final Object object) {
+    }
 
+    @Override
     public String titleString() {
         return titleString;
     }
@@ -147,31 +156,41 @@ public class TestProxyAdapter implements
         return str.toString();
     }
 
+    @Override
     public void changeState(final ResolveState state) {
         this.state.isValidToChangeTo(state);
         this.state = state;
     }
 
+    @Override
     public void replacePojo(final Object pojo) {
         throw new NotYetImplementedException();
     }
 
-    public void fireChangedEvent() {}
+    @Override
+    public void fireChangedEvent() {
+    }
 
+    @Override
     public TypeOfFacet getTypeOfFacet() {
         return null;
     }
 
-    public void setTypeOfFacet(final TypeOfFacet typeOfFacet) {}
+    @Override
+    public void setTypeOfFacet(final TypeOfFacet typeOfFacet) {
+    }
 
+    @Override
     public ObjectAdapter getOwner() {
         return null;
     }
 
+    @Override
     public Instance getInstance(Specification specification) {
         return null;
     }
 
+    @Override
     public boolean isAggregated() {
         return false;
     }

Modified: incubator/isis/trunk/defaults/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/pom.xml?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/pom.xml (original)
+++ incubator/isis/trunk/defaults/security/pom.xml Wed Nov  3 01:24:18 2010
@@ -9,7 +9,7 @@
 
 	<groupId>org.apache.isis.defaults</groupId>
 	<artifactId>security</artifactId>
-	<name>Default Security (File)</name>
+	<name>Default Security (No-op)</name>
 
 	<properties>
         <siteBaseDir>../..</siteBaseDir>



Mime
View raw message