incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1138235 - in /incubator/isis/trunk: core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/ runtimes/dflt/objectstores/xml/src/te...
Date Tue, 21 Jun 2011 22:49:37 GMT
Author: danhaywood
Date: Tue Jun 21 22:49:36 2011
New Revision: 1138235

URL: http://svn.apache.org/viewvc?rev=1138235&view=rev
Log:
minor tidy up and refactoring (no functional changes) while working on the isis-default-runtime.xml
documentation; biggest change is the removal of the (unused) Class passed into InstallerLookupDefault

Removed:
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturesinstaller/
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/optionvalidatorapi/
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/config/
    incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/help/file/
Modified:
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/AggregatedOid.java
    incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java
    incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java
    incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java
    incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java
    incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstallerTest.java
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installers/InstallerLookupDefault.java
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/simple/SerialOid.java
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionFactory.java
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerAbstract.java
    incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java
    incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java
    incubator/isis/trunk/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerDeploymentTypeWebServer.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
    incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/AggregatedOid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/AggregatedOid.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/AggregatedOid.java
(original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/AggregatedOid.java
Tue Jun 21 22:49:36 2011
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.exce
 /**
  * Used as the {@link Oid} for collections, values and <tt>@Aggregated</tt> types.
  */
-public class AggregatedOid implements Oid, Serializable {
+public final class AggregatedOid implements Oid, Serializable {
 
     private static final long serialVersionUID = 1L;
 

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java
(original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java
Tue Jun 21 22:49:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.a
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 
-public abstract class DirectlyStringableOidAbstract implements DirectlyStringableOid {
+abstract class DirectlyStringableOidAbstract implements DirectlyStringableOid {
 
     @Override
     public void clearPrevious() {

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java
(original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java
Tue Jun 21 22:49:36 2011
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.a
 
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 
-public class OidConformant extends DirectlyStringableOidAbstract {
+class OidConformant extends DirectlyStringableOidAbstract {
 
     public static Oid deString(final String oidStr) {
         return new OidConformant();

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java
(original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java
Tue Jun 21 22:49:36 2011
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.a
 
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 
-public class OidWithNonPublicDestringMethod extends DirectlyStringableOidAbstract implements
DirectlyStringableOid {
+class OidWithNonPublicDestringMethod extends DirectlyStringableOidAbstract implements DirectlyStringableOid
{
 
     protected static Oid deString(final String oidStr) {
         return new OidWithNonPublicDestringMethod();

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java
(original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java
Tue Jun 21 22:49:36 2011
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.a
 
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 
-public class OidWithNonStaticDestringMethod extends DirectlyStringableOidAbstract implements
DirectlyStringableOid {
+class OidWithNonStaticDestringMethod extends DirectlyStringableOidAbstract implements DirectlyStringableOid
{
 
     public Oid deString(final String oidStr) {
         return new OidWithNonStaticDestringMethod();

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstallerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstallerTest.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstallerTest.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstallerTest.java
Tue Jun 21 22:49:36 2011
@@ -28,28 +28,25 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
 import org.apache.isis.runtimes.dflt.runtime.testsystem.ProxyJunit4TestCase;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Before;
 import org.junit.Test;
 
 public class XmlPersistenceMechanismInstallerTest extends ProxyJunit4TestCase {
 
-    private final Mockery context = new JUnit4Mockery();
-    private DeploymentType mockDeploymentType;
-    XmlPersistenceMechanismInstaller mockInstaller;
+    private DeploymentType deploymentType;
+    XmlPersistenceMechanismInstaller installer;
 
     @Before
     public void setUp() throws Exception {
-        mockDeploymentType =
+        deploymentType =
             new DeploymentType("SINGLE_USER", DeploymentCategory.PRODUCTION, ContextCategory.STATIC,
                 SystemConstants.VIEWER_DEFAULT, Splash.NO_SHOW);
-        mockInstaller = new XmlPersistenceMechanismInstaller();
+        installer = new XmlPersistenceMechanismInstaller();
     }
 
     @Test
     public void testCreatePersistenceSessionFactory() throws Exception {
-        final PersistenceSessionFactory factory = mockInstaller.createPersistenceSessionFactory(mockDeploymentType);
+        final PersistenceSessionFactory factory = installer.createPersistenceSessionFactory(deploymentType);
         assertTrue(factory != null);
     }
 

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installers/InstallerLookupDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installers/InstallerLookupDefault.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installers/InstallerLookupDefault.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installers/InstallerLookupDefault.java
Tue Jun 21 22:49:36 2011
@@ -86,8 +86,6 @@ public class InstallerLookupDefault impl
 
     private final List<Installer> installerList = new ArrayList<Installer>();
 
-    @SuppressWarnings("unused")
-    private final Class<?> cls;
 
     /**
      * A mutable representation of the {@link IsisConfiguration configuration}, injected
prior to {@link #init()}.
@@ -102,8 +100,7 @@ public class InstallerLookupDefault impl
     // Constructor
     // ////////////////////////////////////////////////////////
 
-    public InstallerLookupDefault(final Class<?> cls) {
-        this.cls = cls;
+    public InstallerLookupDefault() {
         loadInstallers();
     }
 

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
Tue Jun 21 22:49:36 2011
@@ -213,6 +213,17 @@ public class PojoAdapter extends Instanc
         return getOid() instanceof AggregatedOid;
     }
 
+    @Override
+    public ObjectAdapter getAggregateRoot() {
+        if (getSpecification().isAggregated()) {
+            final Oid parentOid = ((AggregatedOid) this.getOid()).getParentOid();
+            return getAdapterManager().getAdapterFor(parentOid);
+        } else {
+            return this;
+        }
+    }
+
+
     // ///////////////////////////////////////////////////////////////////
     // Version
     // ///////////////////////////////////////////////////////////////////
@@ -272,7 +283,7 @@ public class PojoAdapter extends Instanc
                 return (String) getObject();
             }
             final ObjectSpecification specification = getSpecification();
-            final Localization localization = IsisContext.getLocalization();
+            final Localization localization = getLocalization();
             String title = specification.getTitle(this, localization);
             if (title == null) {
                 if (resolveState.isGhost()) {
@@ -409,9 +420,13 @@ public class PojoAdapter extends Instanc
     }
 
     // ///////////////////////////////////////////////////////////////////
-    // Dependencies (from singleton)
+    // Dependencies (from context)
     // ///////////////////////////////////////////////////////////////////
 
+    protected Localization getLocalization() {
+        return IsisContext.getLocalization();
+    }
+
     private SpecificationLoader getReflector() {
         return IsisContext.getSpecificationLoader();
     }
@@ -420,20 +435,6 @@ public class PojoAdapter extends Instanc
         return IsisContext.getPersistenceSession();
     }
 
-    @Override
-    public ObjectAdapter getAggregateRoot() {
-        if (getSpecification().isAggregated()) {
-            final Oid parentOid = ((AggregatedOid) this.getOid()).getParentOid();
-            return getAdapterManager().getAdapterFor(parentOid);
-        } else {
-            return this;
-        }
-    }
-
-    // ////////////////////////////////////////////////////////////////
-    // Dependencies (from context)
-    // ////////////////////////////////////////////////////////////////
-
     protected AdapterManager getAdapterManager() {
         return getPersistenceSession().getAdapterManager();
     }

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/simple/SerialOid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/simple/SerialOid.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/simple/SerialOid.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/simple/SerialOid.java
Tue Jun 21 22:49:36 2011
@@ -32,7 +32,7 @@ import org.apache.isis.core.commons.ensu
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
 
-public final class SerialOid implements Oid, Encodable, Serializable, DirectlyStringableOid
{
+public final class SerialOid implements Encodable, Serializable, DirectlyStringableOid {
 
     private static final long serialVersionUID = 1L;
 

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java
Tue Jun 21 22:49:36 2011
@@ -50,7 +50,7 @@ public class IsisModule extends Abstract
     private final List<String> viewerNames = Lists.newArrayList();
 
     private static InstallerLookupDefault defaultInstallerLookup() {
-        return new InstallerLookupDefault(IsisModule.class);
+        return new InstallerLookupDefault();
     }
 
     private static IsisConfigurationBuilderDefault defaultConfigurationBuider() {

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java
Tue Jun 21 22:49:36 2011
@@ -91,7 +91,7 @@ public class IsisRunner {
         // setup logging immediately
         loggingConfigurer.configureLogging(determineConfigDirectory(), args);
 
-        this.installerLookup = new InstallerLookupDefault(IsisRunner.class);
+        this.installerLookup = new InstallerLookupDefault();
 
         addOptionHandler(optionHandlerDeploymentType);
         this.optionHandlerViewer = addStandardOptionHandlersAndValidators(this.installerLookup);

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java
Tue Jun 21 22:49:36 2011
@@ -169,10 +169,6 @@ public class IsisContextThreadLocal exte
     public IsisSession getSessionInstance() {
         final Thread thread = Thread.currentThread();
         final IsisSession session = sessionsByThread.get(thread);
-        /*
-         * REVIEW this has been moved to IsisContext.getSession() if (session == null) {
throw new
-         * IllegalStateException("No Session opened for this thread"); }
-         */
         return session;
     }
 

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionFactory.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionFactory.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionFactory.java
Tue Jun 21 22:49:36 2011
@@ -52,8 +52,8 @@ public interface PersistenceSessionFacto
     // Services
     // //////////////////////////////////////////////////////
 
-    void setServices(List<Object> servicesList);
+    public void setServices(List<Object> servicesList);
 
-    List<Object> getServices();
+    public List<Object> getServices();
 
 }

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java
Tue Jun 21 22:49:36 2011
@@ -84,6 +84,6 @@ public interface IsisSessionFactory exte
 
     public UserProfileLoader getUserProfileLoader();
 
-    List<Object> getServices();
+    public List<Object> getServices();
 
 }

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerAbstract.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerAbstract.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerAbstract.java
Tue Jun 21 22:49:36 2011
@@ -48,7 +48,6 @@ public abstract class IsisViewerAbstract
 
     private SystemDependencyInjector systemDependencyInjector;
     private IsisConfigurationBuilder isisConfigurationBuilder;
-    private IsisSystem system; // never written to!!!
 
     /**
      * Optionally set, see {@link #setAuthenticationRequestViaArgs(AuthenticationRequest)}
@@ -109,8 +108,7 @@ public abstract class IsisViewerAbstract
     // ////////////////////////////////////////////////////////////////
 
     public LogonFixture getLogonFixture() {
-        // REVIEW: always return null? (since 'system' never written to...)
-        return system != null ? system.getLogonFixture() : null;
+        return null;
     }
 
     // ////////////////////////////////////////////////////////////////

Modified: incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java
Tue Jun 21 22:49:36 2011
@@ -92,7 +92,7 @@ public class IsisWebAppBootstrapper impl
             isisConfigurationBuilder.add(WebAppConstants.WEB_APP_DIR, webappDir);
             isisConfigurationBuilder.add(SystemConstants.NOSPLASH_KEY, "true");
 
-            final InstallerLookup installerLookup = new InstallerLookupDefault(getClass());
+            final InstallerLookup installerLookup = new InstallerLookupDefault();
 
             injector = createGuiceInjector(isisConfigurationBuilder, deploymentType, installerLookup);
 

Modified: incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java
Tue Jun 21 22:49:36 2011
@@ -103,7 +103,7 @@ public class AuthenticationSessionLookup
     // Dependencies (from context)
     // //////////////////////////////////////////////////////////
 
-    private static AuthenticationManager getAuthenticationManager() {
+    protected AuthenticationManager getAuthenticationManager() {
         return IsisContext.getAuthenticationManager();
     }
 

Modified: incubator/isis/trunk/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerDeploymentTypeWebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerDeploymentTypeWebServer.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerDeploymentTypeWebServer.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerDeploymentTypeWebServer.java
Tue Jun 21 22:49:36 2011
@@ -28,8 +28,10 @@ import org.apache.isis.runtimes.dflt.run
 
 public class OptionHandlerDeploymentTypeWebServer extends OptionHandlerDeploymentType {
 
+    private static final String TYPES = 
+        TYPE_SERVER_EXPLORATION + "; " + TYPE_SERVER_PROTOTYPE + " (default); " + TYPE_SERVER;
+
     public OptionHandlerDeploymentTypeWebServer() {
-        super(DeploymentType.SERVER_PROTOTYPE, TYPE_SERVER_EXPLORATION + "; " + TYPE_SERVER_PROTOTYPE
+ " (default); "
-            + TYPE_SERVER);
+        super(DeploymentType.SERVER_PROTOTYPE, TYPES);
     }
 }

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
(original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
Tue Jun 21 22:49:36 2011
@@ -137,7 +137,7 @@ public class Scenario implements AliasRe
 
     private IsisSystem createSystem(final DeploymentType deploymentType,
         final IsisConfigurationBuilder isisConfigurationBuilder) {
-        this.installerLookup = new InstallerLookupDefault(this.getClass());
+        this.installerLookup = new InstallerLookupDefault();
         isisConfigurationBuilder.injectInto(installerLookup);
 
         final Injector injector = createGuiceInjector(deploymentType, isisConfigurationBuilder,
installerLookup);

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
(original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
Tue Jun 21 22:49:36 2011
@@ -263,19 +263,23 @@ public class DndViewer extends IsisViewe
     }
 
     private AuthenticationRequest determineRequestIfPossible() {
-        AuthenticationRequest request;
+        
         // command line args
-        request = getAuthenticationRequestViaArgs();
+        AuthenticationRequest request = getAuthenticationRequestViaArgs();;
 
-        // exploration
-        if (request == null && getDeploymentType().isExploring()) {
-            request = new AuthenticationRequestExploration(getLogonFixture());
+        // exploration & (optionally) logon fixture provided
+        if (request == null) {
+            if (getDeploymentType().isExploring()) {
+                request = new AuthenticationRequestExploration(getLogonFixture());
+            }
         }
 
         // logon fixture provided
-        if (request == null && getLogonFixture() != null && !loggedInUsingLogonFixture)
{
-            loggedInUsingLogonFixture = true;
-            request = new AuthenticationRequestLogonFixture(getLogonFixture());
+        if (request == null) {
+            if (getLogonFixture() != null && !loggedInUsingLogonFixture) {
+                loggedInUsingLogonFixture = true;
+                request = new AuthenticationRequestLogonFixture(getLogonFixture());
+            }
         }
         return request;
     }

Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java?rev=1138235&r1=1138234&r2=1138235&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
(original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
Tue Jun 21 22:49:36 2011
@@ -85,7 +85,7 @@ public class IsisTestRunner extends JUni
         final IsisConfigurationBuilder isisConfigurationBuilder = new IsisConfigurationBuilderDefault(configDirIfAny);
         isisConfigurationBuilder.add(SystemConstants.NOSPLASH_KEY, "" + true); // switch
off splash
 
-        final InstallerLookupDefault installerLookup = new InstallerLookupDefault(getClass());
+        final InstallerLookupDefault installerLookup = new InstallerLookupDefault();
         isisConfigurationBuilder.injectInto(installerLookup);
         installerLookup.init();
 



Mime
View raw message