incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1023938 [2/3] - in /incubator/isis/trunk: ./ alternatives/ alternatives/objectstore/nosql/ alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/ alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensio...
Date Mon, 18 Oct 2010 18:30:10 GMT
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstract.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstract.java Mon Oct 18 18:30:03 2010
@@ -28,8 +28,8 @@ import java.awt.image.PixelGrabber;
 
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java Mon Oct 18 18:30:03 2010
@@ -30,10 +30,10 @@ import org.apache.isis.applib.adapters.E
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.adapters.ValueSemanticsProvider;
 import org.apache.isis.applib.clock.Clock;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
 import org.apache.isis.commons.lang.LocaleUtils;
 import org.apache.isis.metamodel.adapter.InvalidEntryException;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
 import org.apache.isis.metamodel.config.ConfigurationConstants;
 import org.apache.isis.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java Mon Oct 18 18:30:03 2010
@@ -23,7 +23,7 @@ package org.apache.isis.metamodel.facets
 import java.util.List;
 
 import org.apache.isis.commons.debug.DebugString;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.ObjectReflector;

Modified: incubator/isis/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/pom.xml (original)
+++ incubator/isis/trunk/core/pom.xml Mon Oct 18 18:30:03 2010
@@ -35,6 +35,7 @@
     </properties>
 
 	<modules>
+        <module>testsupport</module>
 		<module>commons</module>
 		<module>metamodel</module>
 		<module>runtime</module>
@@ -93,6 +94,19 @@
 				<type>test-jar</type>
 			</dependency>
 
+            <!-- testsupport -->
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>testsupport</artifactId>
+                <version>0.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>testsupport</artifactId>
+                <version>0.1-SNAPSHOT</version>
+                <type>test-jar</type>
+            </dependency>
+
 			<!-- commons -->
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>

Modified: incubator/isis/trunk/core/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/pom.xml (original)
+++ incubator/isis/trunk/core/runtime/pom.xml Mon Oct 18 18:30:03 2010
@@ -40,6 +40,12 @@
 			<scope>test</scope>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>testsupport</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
 			<artifactId>commons</artifactId>

Added: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/Isis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/Isis.java?rev=1023938&view=auto
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/Isis.java (added)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/Isis.java Mon Oct 18 18:30:03 2010
@@ -0,0 +1,28 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+
+package org.apache.isis;
+
+public class Isis {
+	
+    public static void main(final String[] args) {
+    	org.apache.isis.runtime.Isis.main(args);
+	}
+}

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/about/AboutIsis.java (from r1023802, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/about/AboutIsis.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/about/AboutIsis.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/about/AboutIsis.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/about/AboutIsis.java&r1=1023802&r2=1023938&rev=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/about/AboutIsis.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/about/AboutIsis.java Mon Oct 18 18:30:03 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.commons.about;
+package org.apache.isis.runtime.about;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/about/ComponentDetails.java (from r1023802, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/about/ComponentDetails.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/about/ComponentDetails.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/about/ComponentDetails.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/about/ComponentDetails.java&r1=1023802&r2=1023938&rev=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/about/ComponentDetails.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/about/ComponentDetails.java Mon Oct 18 18:30:03 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.commons.about;
+package org.apache.isis.runtime.about;
 
 public interface ComponentDetails {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/Authenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/Authenticator.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/Authenticator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authentication/standard/Authenticator.java Mon Oct 18 18:30:03 2010
@@ -23,11 +23,7 @@ package org.apache.isis.runtime.authenti
 import org.apache.isis.commons.components.ApplicationScopedComponent;
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtime.authentication.standard.file.FileAuthenticator;
 
-import com.google.inject.ImplementedBy;
-
-@ImplementedBy(FileAuthenticator.class)
 public interface Authenticator extends ApplicationScopedComponent {
 	
 	boolean canAuthenticate(AuthenticationRequest request);

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandard.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandard.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandard.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationManagerStandard.java Mon Oct 18 18:30:03 2010
@@ -20,12 +20,11 @@
 
 package org.apache.isis.runtime.authorization.standard;
 
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authorization.AuthorizationManagerAbstract;
-import org.apache.isis.runtime.authorization.standard.noop.NoopAuthorizor;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.runtime.authorization.AuthorizationManagerAbstract;
 
 public class AuthorizationManagerStandard extends AuthorizationManagerAbstract {
 
@@ -37,7 +36,26 @@ public class AuthorizationManagerStandar
     
 	public AuthorizationManagerStandard(final IsisConfiguration configuration) {
     	super(configuration);
-    	authorizor = new NoopAuthorizor(); // avoid null pointers
+    	// avoid null pointers
+    	authorizor = new Authorizor(){
+
+			@Override
+			public void init() {
+			}
+
+			@Override
+			public void shutdown() {
+			}
+
+			@Override
+			public boolean isVisibleInRole(String user, Identifier identifier) {
+				return true;
+			}
+
+			@Override
+			public boolean isUsableInRole(String role, Identifier identifier) {
+				return true;
+			}}; 
     }
 
     ///////////////////////////////////////////////////////////

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java Mon Oct 18 18:30:03 2010
@@ -28,9 +28,9 @@ import org.apache.isis.commons.debug.Deb
 import org.apache.isis.commons.debug.DebugList;
 import org.apache.isis.commons.debug.DebugString;
 import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.commons.lang.Maybe;
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.config.ConfigurationException;
 import org.apache.isis.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextPipe.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextPipe.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextPipe.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextPipe.java Mon Oct 18 18:30:03 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.runtime.context;
 
 import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.commons.lang.Maybe;
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.runtime.session.IsisSession;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextStatic.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextStatic.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextStatic.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextStatic.java Mon Oct 18 18:30:03 2010
@@ -22,9 +22,9 @@ package org.apache.isis.runtime.context;
 
 import org.apache.isis.commons.debug.DebugInfo;
 import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.commons.lang.Maybe;
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.runtime.session.IsisSession;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 import org.apache.isis.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookup.java Mon Oct 18 18:30:03 2010
@@ -62,9 +62,9 @@ public interface InstallerLookup extends
     // framework
     // /////////////////////////////////////////////////////////
 
-    AuthenticationManagerInstaller authenticationManagerInstaller(String requested, boolean isExploring);
+    AuthenticationManagerInstaller authenticationManagerInstaller(String requested, final DeploymentType deploymentType);
 
-    AuthorizationManagerInstaller authorizationManagerInstaller(String requested, boolean isExploring);
+    AuthorizationManagerInstaller authorizationManagerInstaller(String requested, final DeploymentType deploymentType);
 
     FixturesInstaller fixturesInstaller(String requested);
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerLookupDefault.java Mon Oct 18 18:30:03 2010
@@ -31,7 +31,6 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.commons.components.Installer;
 import org.apache.isis.commons.ensure.Assert;
 import org.apache.isis.commons.ensure.Ensure;
@@ -42,17 +41,15 @@ import org.apache.isis.commons.factory.I
 import org.apache.isis.commons.factory.UnavailableClassException;
 import org.apache.isis.commons.lang.CastUtils;
 import org.apache.isis.commons.lang.StringUtils;
-import org.apache.isis.metamodel.commons.about.AboutIsis;
-import org.apache.isis.metamodel.commons.about.ComponentDetails;
 import org.apache.isis.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.config.NotFoundPolicy;
 import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
+import org.apache.isis.runtime.about.AboutIsis;
+import org.apache.isis.runtime.about.ComponentDetails;
 import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
-import org.apache.isis.runtime.authentication.standard.noop.NoopAuthenticationManagerInstaller;
 import org.apache.isis.runtime.authorization.AuthorizationManagerInstaller;
-import org.apache.isis.runtime.authorization.standard.noop.NoopAuthorizationManagerInstaller;
 import org.apache.isis.runtime.fixturesinstaller.FixturesInstaller;
 import org.apache.isis.runtime.imageloader.TemplateImageLoaderInstaller;
 import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
@@ -63,6 +60,7 @@ import org.apache.isis.runtime.system.Sy
 import org.apache.isis.runtime.userprofile.UserProfileStoreInstaller;
 import org.apache.isis.runtime.viewer.IsisViewerInstaller;
 import org.apache.isis.runtime.web.EmbeddedWebServerInstaller;
+import org.apache.log4j.Logger;
 
 import com.google.inject.Inject;
 
@@ -181,14 +179,14 @@ public class InstallerLookupDefault impl
     // Type-safe Lookups
     // ////////////////////////////////////////////////////////
 
-    public AuthenticationManagerInstaller authenticationManagerInstaller(String requested, boolean useNoOp) {
+    public AuthenticationManagerInstaller authenticationManagerInstaller(String requested, final DeploymentType deploymentType) {
         return getInstaller(AuthenticationManagerInstaller.class, requested, SystemConstants.AUTHENTICATION_INSTALLER_KEY, 
-               useNoOp ? NoopAuthenticationManagerInstaller.class.getName() : SystemConstants.AUTHENTICATION_DEFAULT );
+               deploymentType.isExploring() ? SystemConstants.AUTHENTICATION_EXPLORATION_DEFAULT : SystemConstants.AUTHENTICATION_DEFAULT );
     }
 
-    public AuthorizationManagerInstaller authorizationManagerInstaller(String requested, boolean useNoOp) {
+    public AuthorizationManagerInstaller authorizationManagerInstaller(String requested, final DeploymentType deploymentType) {
         return getInstaller(AuthorizationManagerInstaller.class, requested, SystemConstants.AUTHORIZATION_INSTALLER_KEY,
-                useNoOp ? NoopAuthorizationManagerInstaller.class.getName() : SystemConstants.AUTHORIZATION_DEFAULT);
+                !deploymentType.isProduction() ? SystemConstants.AUTHORIZATION_NON_PRODUCTION_DEFAULT : SystemConstants.AUTHORIZATION_DEFAULT);
     }
 
     public FixturesInstaller fixturesInstaller(String requested) {
@@ -337,8 +335,8 @@ public class InstallerLookupDefault impl
         }
         T installer = getInstaller(requiredType, reqImpl);
         if (installer == null) {
-            throw new InstanceCreationException("Failed to load installer class " + reqImpl + " (of type "
-                    + requiredType.getName());
+            throw new InstanceCreationException("Failed to load installer class '" + reqImpl + "' (of type "
+                    + requiredType.getName() + ")");
         }
         return installer;
     }

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerVersion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerVersion.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerVersion.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/installers/InstallerVersion.java Mon Oct 18 18:30:03 2010
@@ -26,8 +26,8 @@ import java.util.Properties;
 
 import org.apache.isis.commons.components.Installer;
 import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.commons.about.AboutIsis;
-import org.apache.isis.metamodel.commons.about.ComponentDetails;
+import org.apache.isis.runtime.about.AboutIsis;
+import org.apache.isis.runtime.about.ComponentDetails;
 
 /**
  * Details name and version of installer.

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/logging/SnapshotAppender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/logging/SnapshotAppender.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/logging/SnapshotAppender.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/logging/SnapshotAppender.java Mon Oct 18 18:30:03 2010
@@ -29,7 +29,7 @@ import org.apache.log4j.helpers.CyclicBu
 import org.apache.log4j.helpers.OptionConverter;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.TriggeringEventEvaluator;
-import org.apache.isis.metamodel.commons.about.AboutIsis;
+import org.apache.isis.runtime.about.AboutIsis;
 
 
 class DefaultEvaluator implements TriggeringEventEvaluator {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java Mon Oct 18 18:30:03 2010
@@ -28,10 +28,10 @@ import java.util.List;
 import org.apache.log4j.Logger;
 import org.apache.isis.commons.debug.DebugString;
 import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ResolveState;
 import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
 import org.apache.isis.metamodel.encoding.DataInputStreamExtended;
 import org.apache.isis.metamodel.encoding.DataOutputStreamExtended;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java Mon Oct 18 18:30:03 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.runtime.persistence.adaptermanager;
 
+import org.apache.isis.commons.exceptions.UnknownTypeException;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java Mon Oct 18 18:30:03 2010
@@ -23,7 +23,6 @@ package org.apache.isis.runtime.persiste
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.services.ServicesInjector;
 import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.objectstore.inmemory.InMemoryObjectStore;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java Mon Oct 18 18:30:03 2010
@@ -24,7 +24,6 @@ import org.apache.isis.metamodel.adapter
 import org.apache.isis.metamodel.adapter.ResolveState;
 import org.apache.isis.metamodel.services.ServicesInjector;
 import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.objectstore.inmemory.InMemoryObjectStore;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryAbstract.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryAbstract.java Mon Oct 18 18:30:03 2010
@@ -27,7 +27,6 @@ import org.apache.isis.metamodel.service
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
 import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.objectstore.inmemory.InMemoryObjectStore;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java Mon Oct 18 18:30:03 2010
@@ -21,10 +21,10 @@
 package org.apache.isis.runtime.persistence.objectstore.algorithm.dflt;
 
 import org.apache.log4j.Logger;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
 import org.apache.isis.commons.lang.ToString;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;

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=1023938&r1=1023937&r2=1023938&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 Mon Oct 18 18:30:03 2010
@@ -29,9 +29,9 @@ import org.apache.isis.commons.component
 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.commons.about.AboutIsis;
 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;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java Mon Oct 18 18:30:03 2010
@@ -105,9 +105,13 @@ public final class SystemConstants {
      */
     public static final String AUTHENTICATION_INSTALLER_KEY = ConfigurationConstants.ROOT + AuthenticationManagerInstaller.TYPE;
     /**
-     * Default for {@link #AUTHENTICATION_INSTALLER_KEY}
+     * Default for {@link #AUTHENTICATION_INSTALLER_KEY} if not exploring.
      */
     public static final String AUTHENTICATION_DEFAULT = "file";
+    /**
+     * Default for {@link #AUTHENTICATION_INSTALLER_KEY} if exploring.
+     */
+	public static final String AUTHENTICATION_EXPLORATION_DEFAULT = "noop";
 
     /**
      * Key used to lookup {@link AuthorizationManager authorization manager} in
@@ -116,9 +120,14 @@ public final class SystemConstants {
      */
     public static final String AUTHORIZATION_INSTALLER_KEY = ConfigurationConstants.ROOT + AuthorizationManagerInstaller.TYPE;
     /**
-     * Default for {@link #AUTHORIZATION_DEFAULT}
+     * Default for {@link #AUTHORIZATION_DEFAULT} if production.
      */
     public static final String AUTHORIZATION_DEFAULT = "file";
+
+    /**
+     * Default for {@link #AUTHORIZATION_DEFAULT} if not production.
+     */
+	public static final String AUTHORIZATION_NON_PRODUCTION_DEFAULT = "noop";
 
     /**
      * Key used to lookup {@link ServicesInstaller services installer} in {@link IsisConfiguration},
@@ -201,7 +210,9 @@ public final class SystemConstants {
     public static final String NOSPLASH_KEY = ConfigurationConstants.ROOT + "nosplash";
     public static final boolean NOSPLASH_DEFAULT = false;
 
-    public static final String LOCALE_KEY = ConfigurationConstants.ROOT + "locale";
+    public static final String LOCALE_KEY = ConfigurationConstants.ROOT + "locale";
+
+
 
     private SystemConstants() {}
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java Mon Oct 18 18:30:03 2010
@@ -179,13 +179,13 @@ public class IsisSystemUsingInstallers e
 
 	private void lookupAndSetAuthenticatorAndAuthorizationInstallers(DeploymentType deploymentType) {
 		// use the one specified in configuration
-		final AuthenticationManagerInstaller authenticationInstaller = installerLookup.authenticationManagerInstaller(null, deploymentType.isExploring());
+		final AuthenticationManagerInstaller authenticationInstaller = installerLookup.authenticationManagerInstaller(null,deploymentType);
 		if (authenticationInstaller != null) {
 		    setAuthenticationInstaller(authenticationInstaller);
 		}
 
 		// use the one specified in configuration
-		final AuthorizationManagerInstaller authorizationInstaller = installerLookup.authorizationManagerInstaller(null, !deploymentType.isProduction());
+		final AuthorizationManagerInstaller authorizationInstaller = installerLookup.authorizationManagerInstaller(null, deploymentType);
 		if (authorizationInstaller != null) {
 		    setAuthorizationInstaller(authorizationInstaller);
 		}

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=1023938&r1=1023937&r2=1023938&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 Mon Oct 18 18:30:03 2010
@@ -31,7 +31,7 @@ import java.awt.Window;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.commons.about.AboutIsis;
+import org.apache.isis.runtime.about.AboutIsis;
 import org.apache.isis.runtime.imageloader.TemplateImage;
 import org.apache.isis.runtime.imageloader.TemplateImageLoader;
 

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=1023938&r1=1023937&r2=1023938&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 Mon Oct 18 18:30:03 2010
@@ -32,7 +32,7 @@ import java.util.TimeZone;
 
 import org.apache.isis.commons.exceptions.IsisException;
 import org.apache.isis.commons.io.IoUtils;
-import org.apache.isis.metamodel.commons.about.AboutIsis;
+import org.apache.isis.runtime.about.AboutIsis;
 
 
 public class SystemPrinter {

Modified: incubator/isis/trunk/core/runtime/src/main/resources/installer-registry.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/resources/installer-registry.properties?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/resources/installer-registry.properties (original)
+++ incubator/isis/trunk/core/runtime/src/main/resources/installer-registry.properties Mon Oct 18 18:30:03 2010
@@ -9,10 +9,12 @@ org.apache.isis.runtime.imageloader.awt.
 org.apache.isis.runtime.system.installers.JavaReflectorInstaller   # "java"
 
 # authenticators
+org.apache.isis.runtime.authentication.standard.noop.NoopAuthenticationManagerInstaller # "noop"
 org.apache.isis.runtime.authentication.standard.file.FileAuthenticationManagerInstaller # "file"
 org.apache.isis.runtime.authentication.standard.ldap.LdapAuthenticationManagerInstaller # "ldap"
 
 # authorization
+org.apache.isis.runtime.authorization.standard.noop.NoopAuthorizationManagerInstaller  # "noop"
 org.apache.isis.runtime.authorization.standard.file.FileAuthorizationManagerInstaller  # "file"
 org.apache.isis.runtime.authorization.standard.ldap.LdapAuthorizationManagerInstaller  # "ldap"
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java Mon Oct 18 18:30:03 2010
@@ -20,22 +20,21 @@
 
 package org.apache.isis.runtime.authentication.standard;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authentication.NoAuthenticatorException;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtime.authentication.standard.noop.AuthenticatorNoop;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.runtime.authentication.NoAuthenticatorException;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith(JMock.class)
 public class StandardAuthenticationManager_AuthenticatorsTest {
@@ -43,12 +42,13 @@ public class StandardAuthenticationManag
 	private Mockery mockery = new JUnit4Mockery();
 
 	private IsisConfiguration mockConfiguration;
-	private AuthenticationManagerStandard authenticationManager;
+	private AuthenticationManagerStandard authenticationManager;
+	private Authenticator mockAuthenticator;
     
     @Before
     public void setUp() throws Exception {
         mockConfiguration = mockery.mock(IsisConfiguration.class);
-
+        mockAuthenticator = mockery.mock(Authenticator.class);
     	authenticationManager = new AuthenticationManagerStandard(mockConfiguration);
     }
 
@@ -64,16 +64,15 @@ public class StandardAuthenticationManag
 
     @Test
     public void shouldBeAbleToAddAuthenticators() throws Exception {
-        Authenticator authenticator = new AuthenticatorNoop(mockConfiguration);
-        authenticationManager.addAuthenticator(authenticator);
+        authenticationManager.addAuthenticator(mockAuthenticator);
         assertThat(authenticationManager.getAuthenticators().size(), is(1));
-        assertThat(authenticationManager.getAuthenticators().get(0), is(sameInstance(authenticator)));
+        assertThat(authenticationManager.getAuthenticators().get(0), is(sameInstance(mockAuthenticator)));
     }
 
     @Test(expected=UnsupportedOperationException.class)
     public void shouldNotBeAbleToModifyReturnedAuthenticators() throws Exception {
         List<Authenticator> authenticators = authenticationManager.getAuthenticators();
-        authenticators.add(new AuthenticatorNoop(mockConfiguration));
+        authenticators.add(mockAuthenticator);
     }
 
 }

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/OneToOneAssociationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/OneToOneAssociationTest.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/OneToOneAssociationTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/OneToOneAssociationTest.java Mon Oct 18 18:30:03 2010
@@ -21,10 +21,10 @@
 package org.apache.isis.runtime.testspec;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.metamodel.adapter.Instance;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.metamodel.consent.Allow;
 import org.apache.isis.metamodel.consent.Consent;
 import org.apache.isis.metamodel.consent.InteractionInvocationMethod;

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=1023938&r1=1023937&r2=1023938&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 Mon Oct 18 18:30:03 2010
@@ -23,13 +23,13 @@ package org.apache.isis.runtime.testsyst
 import java.util.Hashtable;
 
 import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.commons.lang.ToString;
 import org.apache.isis.metamodel.adapter.Instance;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ResolveState;
 import org.apache.isis.metamodel.adapter.oid.Oid;
 import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.spec.Specification;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAssociation.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAssociation.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAssociation.java Mon Oct 18 18:30:03 2010
@@ -25,10 +25,10 @@ import java.util.Hashtable;
 import junit.framework.Assert;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.metamodel.adapter.Instance;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.metamodel.consent.Allow;
 import org.apache.isis.metamodel.consent.Consent;
 import org.apache.isis.metamodel.consent.ConsentAbstract;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyCollectionAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyCollectionAdapter.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyCollectionAdapter.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyCollectionAdapter.java Mon Oct 18 18:30:03 2010
@@ -30,13 +30,13 @@ import org.apache.commons.collections.Co
 import org.apache.commons.collections.EnumerationUtils;
 import org.apache.commons.collections.iterators.IteratorEnumeration;
 import org.apache.isis.commons.ensure.Assert;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.adapter.Instance;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ObjectList;
 import org.apache.isis.metamodel.adapter.ResolveState;
 import org.apache.isis.metamodel.adapter.oid.Oid;
 import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyConfiguration.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyConfiguration.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyConfiguration.java Mon Oct 18 18:30:03 2010
@@ -28,8 +28,8 @@ import java.util.Hashtable;
 import junit.framework.AssertionFailedError;
 
 import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.commons.resource.ResourceStreamSource;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.config.IsisConfiguration;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyIdentityMapOriginal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyIdentityMapOriginal.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyIdentityMapOriginal.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyIdentityMapOriginal.java Mon Oct 18 18:30:03 2010
@@ -26,10 +26,10 @@ import java.util.Vector;
 
 import org.apache.isis.commons.debug.DebugString;
 import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ResolveState;
 import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.spec.identifier.Identified;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.context.IsisContext;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java Mon Oct 18 18:30:03 2010
@@ -27,10 +27,10 @@ import static org.apache.isis.commons.en
 import java.util.Hashtable;
 import java.util.Vector;
 
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ResolveState;
 import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.services.ServicesInjectorDefault;
 import org.apache.isis.metamodel.services.container.DomainObjectContainerDefault;
 import org.apache.isis.metamodel.spec.ObjectSpecification;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSessionFactory.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSessionFactory.java Mon Oct 18 18:30:03 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.testsyst
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.PersistenceSessionFactory;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyReflector.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyReflector.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyReflector.java Mon Oct 18 18:30:03 2010
@@ -25,8 +25,8 @@ import java.util.Hashtable;
 import java.util.List;
 
 import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.services.ServicesInjector;
 import org.apache.isis.metamodel.services.ServicesInjectorNoop;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java Mon Oct 18 18:30:03 2010
@@ -27,11 +27,11 @@ import java.util.List;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.commons.debug.DebugString;
 import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.commons.filters.Filter;
 import org.apache.isis.metamodel.adapter.Instance;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.metamodel.consent.Consent;
 import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.metamodel.consent.InteractionResult;

Added: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/WebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/WebServer.java?rev=1023938&view=auto
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/WebServer.java (added)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/WebServer.java Mon Oct 18 18:30:03 2010
@@ -0,0 +1,30 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+
+package org.apache.isis;
+
+public class WebServer {
+
+    public static void main(String[] args) {
+        org.apache.isis.webserver.WebServer.main(args);
+    }
+    
+
+}

Modified: incubator/isis/trunk/defaults/objectstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/pom.xml (original)
+++ incubator/isis/trunk/defaults/objectstore/pom.xml Mon Oct 18 18:30:03 2010
@@ -16,6 +16,14 @@
 	</properties>
 	
 	<dependencies>
+    
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>metamodel</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        
 		<dependency>
 		    <groupId>org.apache.isis.core</groupId>
 		    <artifactId>runtime</artifactId>
@@ -26,6 +34,7 @@
 		    <type>test-jar</type>
 		    <scope>test</scope>
 		</dependency>
+        
 	</dependencies>
 
 </project>

Copied: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java (from r1023145, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java?p2=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java&r1=1023145&r2=1023938&rev=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java Mon Oct 18 18:30:03 2010
@@ -101,7 +101,7 @@ public class InMemoryObjectStore impleme
         }
     }
 
-    private void recreateAdapters() {
+    protected void recreateAdapters() {
         for(ObjectSpecification noSpec: persistedObjects.specifications()) {
 			if (LOG.isDebugEnabled()) {
 				LOG.debug("recreating adapters for: " + noSpec.getFullName());

Copied: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java (from r1023145, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java?p2=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java&r1=1023145&r2=1023938&rev=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java Mon Oct 18 18:30:03 2010
@@ -59,7 +59,7 @@ public class ObjectStorePersistedObjects
 	public void registerService(String name, Oid oid) {
     	Oid oidLookedUpByName = serviceOidByIdMap.get(name);
     	if (oidLookedUpByName != null) {
-    		if (!oidLookedUpByName.equals(oid)) {
+    		if (oidLookedUpByName.equals(oid)) {
     			throw new IsisException(
     					"Already another service registered as name: " + name + 
     					" (existing Oid: " + oidLookedUpByName + ", " +

Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java (from r1023145, incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java&p1=incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java&r1=1023145&r2=1023938&rev=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java Mon Oct 18 18:30:03 2010
@@ -43,6 +43,9 @@ import org.apache.isis.runtime.testdomai
 import org.apache.isis.runtime.testsystem.TestProxySystemII;
 
 
+/**
+ * TODO: remove dependency on {@link TestProxySystemII} and move back to runtime.
+ */
 public class ObjectFixtureFilePersistorTest {
 
     private ObjectFixtureFilePersistor persistor;

Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java (from r1023145, incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java&p1=incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java&r1=1023145&r2=1023938&rev=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java Mon Oct 18 18:30:03 2010
@@ -40,6 +40,9 @@ import org.apache.isis.runtime.testsyste
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 
 
+/**
+ * TODO: remove dependency on {@link TestProxySystemII} and move back to runtime.
+ */
 public class ObjectFixtureServiceTest {
 
     private ObjectFixtureService service;
@@ -84,7 +87,6 @@ public class ObjectFixtureServiceTest {
         Assert.assertEquals(Person.class, object.getClass());
         Assert.assertEquals("Fred Smith", ((Person) object).getName());
         Assert.assertEquals(new Date(110, 2, 8, 13, 32), ((Person) object).getDate());
-
     }
 
     @Test

Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java (from r1023145, incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java&p1=incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java&r1=1023145&r2=1023938&rev=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java Mon Oct 18 18:30:03 2010
@@ -20,12 +20,17 @@
 
 package org.apache.isis.runtime.objectstore.inmemory;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+import static org.junit.matchers.JUnitMatchers.*;
+
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
@@ -49,6 +54,8 @@ public class InMemoryObjectStore_openAnd
 	private PersistenceSession mockPersistenceSession;
 
 	private ObjectStorePersistedObjects mockObjectStorePersistedObjects;
+
+	private boolean recreatedAdapters = false;
 	
 	@Before
 	public void setUp() throws Exception {
@@ -64,6 +71,10 @@ public class InMemoryObjectStore_openAnd
 			protected PersistenceSession getPersistenceSession() {
 				return mockPersistenceSession;
 			}
+			@Override
+			protected void recreateAdapters() {
+				recreatedAdapters = true;
+			}
 		};
 	}
 
@@ -77,10 +88,13 @@ public class InMemoryObjectStore_openAnd
 	}
 
 	@Test
-	public void whenOpenThenObtainsObjectsFromObjectStoreFactory() throws Exception {
+	public void whenOpenForFirstTimeThenCreatesPersistedObjects() throws Exception {
 		neverInteractsDirectlyWithPersistenceSession();
 		context.checking(new Expectations() {
 			{
+				one(mockInMemoryPersistenceSessionFactory).getPersistedObjects();
+				will(returnValue(null));
+
 				one(mockInMemoryPersistenceSessionFactory).createPersistedObjects();
 				will(returnValue(mockObjectStorePersistedObjects));
 			}
@@ -89,10 +103,25 @@ public class InMemoryObjectStore_openAnd
 	}
 
 	@Test
+	public void whenOpenSubsequentlyThenObtainsPersistedObjectsFromObjectStoreFactoryAndRecreatesAdapters() throws Exception {
+		neverInteractsDirectlyWithPersistenceSession();
+		context.checking(new Expectations() {
+			{
+				one(mockInMemoryPersistenceSessionFactory).getPersistedObjects();
+				will(returnValue(mockObjectStorePersistedObjects));
+			}
+		});
+		
+		assertThat(recreatedAdapters, is(false));
+		objectStore.open();
+		assertThat(recreatedAdapters, is(true));
+	}
+
+	@Test
 	public void whenCloseThenGivesObjectsBackToObjectStoreFactory() throws Exception {
 		neverInteractsDirectlyWithPersistenceSession();
 
-		whenOpenThenObtainsObjectsFromObjectStoreFactory();
+		whenOpenSubsequentlyThenObtainsPersistedObjectsFromObjectStoreFactoryAndRecreatesAdapters();
 
 		context.checking(new Expectations() {
 			{

Added: incubator/isis/trunk/defaults/objectstore/test.data
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/test.data?rev=1023938&view=auto
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/test.data (added)
+++ incubator/isis/trunk/defaults/objectstore/test.data Mon Oct 18 18:30:03 2010
@@ -0,0 +1,4 @@
+org.apache.isis.runtime.testdomain.Person#1
+  name: Fred Smith
+  # ignores: data
+  date: 08-Mar-2010 13:32
\ No newline at end of file

Modified: incubator/isis/trunk/defaults/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/pom.xml (original)
+++ incubator/isis/trunk/defaults/pom.xml Mon Oct 18 18:30:03 2010
@@ -89,6 +89,12 @@
                 <artifactId>objectstore</artifactId>
                 <version>0.1-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.isis.defaults</groupId>
+                <artifactId>objectstore</artifactId>
+                <version>0.1-SNAPSHOT</version>
+                <type>test-jar</type>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.isis.defaults</groupId>

Modified: incubator/isis/trunk/examples/claims/commandline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/commandline/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/commandline/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/commandline/pom.xml Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>org.apache.isis.runtime.Isis</mainClass>
+							<mainClass>org.apache.isis.Isis</mainClass>
 							<addClasspath>true</addClasspath>
 							<addExtensions>false</addExtensions>
 							<classpathPrefix>lib</classpathPrefix>

Modified: incubator/isis/trunk/examples/claims/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/pom.xml Mon Oct 18 18:30:03 2010
@@ -62,15 +62,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<configuration>
-					<preparationGoals>clean install</preparationGoals>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-				</configuration>
-			</plugin>
 			
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
@@ -127,7 +118,7 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
 					<aggregate>true</aggregate>
-					<doctitle>[[NAME]] Application</doctitle>
+					<doctitle>Apache Isis Example Claims Application</doctitle>
 					<splitindex>false</splitindex>
 				</configuration>
 			</plugin>

Modified: incubator/isis/trunk/examples/expenses/commandline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expenses/commandline/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expenses/commandline/pom.xml (original)
+++ incubator/isis/trunk/examples/expenses/commandline/pom.xml Mon Oct 18 18:30:03 2010
@@ -19,7 +19,7 @@
 					<archive>
 						<manifest>
 							<mainClass>
-								org.apache.isis.runtime.Isis
+								org.apache.isis.Isis
 							</mainClass>
 							<addClasspath>true</addClasspath>
 							<addExtensions>false</addExtensions>

Modified: incubator/isis/trunk/examples/orders/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/orders/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/examples/orders/pom.xml (original)
+++ incubator/isis/trunk/examples/orders/pom.xml Mon Oct 18 18:30:03 2010
@@ -43,7 +43,7 @@
                     <archive>
                         <manifest>
                             <mainClass>
-                                org.apache.isis.runtime.Isis
+                                org.apache.isis.Isis
                             </mainClass>
                             <addClasspath>true</addClasspath>
                             <addExtensions>false</addExtensions>

Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Mon Oct 18 18:30:03 2010
@@ -1236,6 +1236,19 @@
                 <module>support</module>
             </modules>
         </profile>
+        <profile>
+            <id>all</id>
+            <modules>
+                <module>applib</module>
+                <module>core</module>
+                <module>defaults</module>
+                <module>alternatives</module>
+                <module>viewer</module>
+                <module>release</module>
+                <module>examples</module>
+                <module>support</module>
+            </modules>
+        </profile>
     </profiles>
 
 </project>

Modified: incubator/isis/trunk/release/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/release/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/release/pom.xml (original)
+++ incubator/isis/trunk/release/pom.xml Mon Oct 18 18:30:03 2010
@@ -47,6 +47,7 @@
         <isis.alternatives-remoting-marshalling-xstream.version>0.1-SNAPSHOT</isis.alternatives-remoting-marshalling-xstream.version>
 
         <isis.alternatives-security-ldap.version>0.1-SNAPSHOT</isis.alternatives-security-ldap.version>
+        <isis.alternatives-security-file.version>0.1-SNAPSHOT</isis.alternatives-security-file.version>
     </properties>
 
     <dependencyManagement>
@@ -170,6 +171,11 @@
                 <artifactId>ldap</artifactId>
                 <version>${isis.alternatives-security-ldap.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.isis.alternatives.security</groupId>
+                <artifactId>file</artifactId>
+                <version>${isis.alternatives-security-file.version}</version>
+            </dependency>
 
 
             <!-- alternatives: objectstores -->

Modified: incubator/isis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/site.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/site.xml (original)
+++ incubator/isis/trunk/src/site/site.xml Mon Oct 18 18:30:03 2010
@@ -41,7 +41,7 @@
 			<item name="License" href="license.html" />
 		</menu>
 
-		<menu name="The [[NAME]] Pattern">
+		<menu name="The Naked Objects Pattern">
 			<item name="An Introduction" href="isis-pattern.html" />
 			<item name="OOUIs" href="oouis.html" />
 			<item name="Benefits" href="isis-pattern-benefits.html" />

Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/commandline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/commandline/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/commandline/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/commandline/pom.xml Mon Oct 18 18:30:03 2010
@@ -19,7 +19,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>org.apache.isis.runtime.Isis</mainClass>
+							<mainClass>org.apache.isis.Isis</mainClass>
 							<addClasspath>true</addClasspath>
 							<addExtensions>false</addExtensions>
 							<classpathPrefix>lib</classpathPrefix>
@@ -54,55 +54,69 @@
 	<dependencies>
 	
 		<!-- other modules in this project -->
-
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>${rootArtifactId}-fixture</artifactId>
 		</dependency>
 
-		<!-- Apache Isis -->
+		<!-- Isis Core -->
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>runtime</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>webserver</artifactId>
+		</dependency>
+		
+		<!-- Isis Defaults -->
 		<dependency>
 			<groupId>org.apache.isis.defaults</groupId>
 			<artifactId>bytecode</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>html</artifactId>
+			<groupId>org.apache.isis.defaults</groupId>
+			<artifactId>security</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>webserver</artifactId>
+			<groupId>org.apache.isis.defaults</groupId>
+			<artifactId>objectstore</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>dnd</artifactId>
+			<groupId>org.apache.isis.defaults</groupId>
+			<artifactId>progmodel</artifactId>
 		</dependency>
+		
+		<!-- Isis Alternatives -->
 		<dependency>
 			<groupId>org.apache.isis.alternatives.objectstore</groupId>
 			<artifactId>xml</artifactId>
 		</dependency>
-
-		<!-- to be confirmed
 		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>http-remoting-client</artifactId>
+			<groupId>org.apache.isis.alternatives.security</groupId>
+			<artifactId>file</artifactId>
+		</dependency>
+		
+		<!-- Isis Viewers -->
+		<dependency>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>dnd</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>http-remoting-server</artifactId>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>html</artifactId>
 		</dependency>
-	    <dependency>
-	        <groupId>org.apache.isis.plugins</groupId>
-	        <artifactId>headless-embedded</artifactId>
-	    </dependency>
-		-->
-		
+
 		<!-- missing dependency -->
+        <!--
+        shouldn't be needed, cos of transitive dependency on o.a.i.defaults:bytecode;
+        I've commented out and works for me
 		<dependency>
 			<groupId>cglib</groupId>
 			<artifactId>cglib-nodep</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+        -->
 		
 	</dependencies>
 



Mime
View raw message