You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/04/29 01:05:58 UTC
svn commit: r1097654 [7/12] - in /incubator/isis/trunk:
core/commons/src/main/java/org/apache/isis/core/commons/debug/
core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/
core/runtime/ core/runtime/src/main/java/org/apache/isis/core/ru...
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstaller.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/ServicesInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstaller.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstaller.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/ServicesInstaller.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/ServicesInstaller.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstaller.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.services;
+package org.apache.isis.runtimes.dflt.runtime.services;
import java.util.List;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerAbstract.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/ServicesInstallerAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerAbstract.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerAbstract.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/ServicesInstallerAbstract.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/ServicesInstallerAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerAbstract.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.services;
+package org.apache.isis.runtimes.dflt.runtime.services;
import static org.apache.isis.core.commons.lang.CastUtils.collectionOf;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/config/ServicesFromConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/config/ServicesFromConfiguration.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/config/ServicesFromConfiguration.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.services.config;
+package org.apache.isis.runtimes.dflt.runtime.services;
import java.util.ArrayList;
import java.util.List;
@@ -33,23 +33,22 @@ import org.apache.isis.core.commons.fact
import org.apache.isis.core.commons.factory.InstanceCreationException;
import org.apache.isis.core.commons.lang.ArrayUtils;
import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.runtimes.dflt.runtime.fixture.ObjectFixtureService;
-import org.apache.isis.runtimes.dflt.runtime.persistence.services.InitialisationException;
-import org.apache.isis.runtimes.dflt.runtime.persistence.services.ServicesInstaller;
-import org.apache.isis.runtimes.dflt.runtime.persistence.services.SimpleRepository;
+import org.apache.isis.runtimes.dflt.runtime.fixturedomainservice.ObjectFixtureService;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
-public class ServicesFromConfiguration extends InstallerAbstract implements ServicesInstaller {
-
- private static final char DELIMITER = '#';
- private static final Logger LOG = Logger.getLogger(ServicesFromConfiguration.class);
+public class ServicesInstallerFromConfiguration extends InstallerAbstract implements ServicesInstaller {
+
+ private static final Logger LOG = Logger.getLogger(ServicesInstallerFromConfiguration.class);
+
private static final String SERVICES = "services";
private static final String EXPLORATION_OBJECTS = "exploration-objects";
private static final String SERVICES_PREFIX = "services.prefix";
- public ServicesFromConfiguration() {
+ private static final char DELIMITER = '#';
+
+ public ServicesInstallerFromConfiguration() {
super(ServicesInstaller.TYPE, "configuration");
}
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/SimpleRepository.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/SimpleRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/SimpleRepository.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/SimpleRepository.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/SimpleRepository.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/SimpleRepository.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/SimpleRepository.java Thu Apr 28 23:05:40 2011
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.services;
+package org.apache.isis.runtimes.dflt.runtime.services;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
public final class SimpleRepository {
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/package-info.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/package-info.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/package-info.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/package-info.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/package-info.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/package-info.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/package-info.java Thu Apr 28 23:05:40 2011
@@ -22,6 +22,6 @@
* Used to specify the set of services (including repositories) to inject into
* domain objects.
*
- * @see org.apache.isis.runtimes.dflt.runtime.fixturesinstaller.FixturesInstaller
+ * @see org.apache.isis.runtimes.dflt.runtime.fixtures.FixturesInstaller
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.services;
\ No newline at end of file
+package org.apache.isis.runtimes.dflt.runtime.services;
\ No newline at end of file
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/snapshot/XmlSnapshotBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/snapshot/XmlSnapshotBuilder.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/snapshot/XmlSnapshotBuilder.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/snapshot/XmlSnapshotBuilder.java Thu Apr 28 23:05:40 2011
@@ -7,8 +7,8 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
import org.apache.isis.core.runtime.snapshot.XmlSchema;
import org.apache.isis.core.runtime.snapshot.XmlSnapshot;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import com.google.common.collect.Lists;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/ContextCategory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/ContextCategory.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/ContextCategory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/ContextCategory.java Thu Apr 28 23:05:40 2011
@@ -22,9 +22,9 @@ package org.apache.isis.runtimes.dflt.ru
import java.util.List;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContextStatic;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContextThreadLocal;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContextStatic;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContextThreadLocal;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
/**
* @see DeploymentType
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/DeploymentType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/DeploymentType.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/DeploymentType.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/DeploymentType.java Thu Apr 28 23:05:40 2011
@@ -24,9 +24,7 @@ import java.util.List;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContextStatic;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
import com.google.common.collect.Lists;
@@ -35,7 +33,7 @@ import com.google.common.collect.Lists;
*
* <p>
* Previously this was an <tt>enum</tt>, but it is now a regular class. The change has been made to provide
- * more flexibility in setting up the {@link IsisContext} lookup.
+ * more flexibility in setting up the <tt>IsisContext</tt> lookup.
*
*
* implementation can be created, specifying in turn a custom {@link ContextCategory} (also now a regular class) can be specified, allowing different was of setting up the
@@ -44,9 +42,9 @@ import com.google.common.collect.Lists;
* <p>
* To use this capability:
* <ul>
- * <li>Write your new implementation of {@link IsisContext}, along with a static factory method (cf {@link IsisContextStatic#createInstance(IsisSessionFactory)})
+ * <li>Write your new implementation of <tt>IsisContext</tt>, along with a static factory method (cf <tt>IsisContextStatic#createInstance(IsisSessionFactory)</tt>)
* <li>Create a new subclass of {@link ContextCategory} (also now a regular class rather than an <tt>enum</tt>); this
- * is where your code goes to instantiate your {@link IsisContext} implementation</li>
+ * is where your code goes to instantiate your <tt>IsisContext</tt> implementation</li>
* <li>Create a new subclass of {@link DeploymentType}, passing in the custom {@link ContextCategory} in its constructor</li>
* <li>In your bootstrap code, instantiate your new {@link DeploymentType} subclass</li>
* <li>When you run your app, don't forget to specify your custom {@link DeploymentType}, eg using the <tt>--type</tt> command line arg</li>
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystem.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystem.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystem.java Thu Apr 28 23:05:40 2011
@@ -23,7 +23,7 @@ package org.apache.isis.runtimes.dflt.ru
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
public interface IsisSystem extends DebugSelection, ApplicationScopedComponent {
Added: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemFixturesHookAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemFixturesHookAbstract.java?rev=1097654&view=auto
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemFixturesHookAbstract.java (added)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemFixturesHookAbstract.java Thu Apr 28 23:05:40 2011
@@ -0,0 +1,396 @@
+/*
+ * 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.runtimes.dflt.runtime.system;
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.core.commons.components.Installer;
+import org.apache.isis.core.commons.components.Noop;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.runtime.about.AboutIsis;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.awt.TemplateImageLoaderAwt;
+import org.apache.isis.core.runtime.userprofile.UserProfileStore;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.ExplorationSession;
+import org.apache.isis.runtimes.dflt.runtime.fixtures.FixturesInstaller;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookup;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.internal.InitialisationSession;
+import org.apache.isis.runtimes.dflt.runtime.system.internal.IsisLocaleInitializer;
+import org.apache.isis.runtimes.dflt.runtime.system.internal.IsisTimeZoneInitializer;
+import org.apache.isis.runtimes.dflt.runtime.system.internal.SplashWindow;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
+
+/**
+ * An implementation of {@link IsisSystem} that has a hook for installing
+ * fixtures but does not install them itself.
+ */
+public abstract class IsisSystemFixturesHookAbstract implements IsisSystem {
+
+ public static final Logger LOG = Logger.getLogger(IsisSystemFixturesHookAbstract.class);
+
+ private static final int SPLASH_DELAY_DEFAULT = 6;
+
+ private final IsisLocaleInitializer localeInitializer;
+ private final IsisTimeZoneInitializer timeZoneInitializer;
+ private final DeploymentType deploymentType;
+
+ private SplashWindow splashWindow;
+
+ private boolean initialized = false;
+
+ private IsisSessionFactory sessionFactory;
+
+ // ///////////////////////////////////////////
+ // Constructors
+ // ///////////////////////////////////////////
+
+ public IsisSystemFixturesHookAbstract(final DeploymentType deploymentType) {
+ this(deploymentType, new IsisLocaleInitializer(), new IsisTimeZoneInitializer());
+ }
+
+ public IsisSystemFixturesHookAbstract(final DeploymentType deploymentType, final IsisLocaleInitializer localeInitializer,
+ final IsisTimeZoneInitializer timeZoneInitializer) {
+ this.deploymentType = deploymentType;
+ this.localeInitializer = localeInitializer;
+ this.timeZoneInitializer = timeZoneInitializer;
+ }
+
+ // ///////////////////////////////////////////
+ // DeploymentType
+ // ///////////////////////////////////////////
+
+ @Override
+ public DeploymentType getDeploymentType() {
+ return deploymentType;
+ }
+
+ // ///////////////////////////////////////////
+ // init, shutdown
+ // ///////////////////////////////////////////
+
+ @Override
+ public void init() {
+
+ if (initialized) {
+ throw new IllegalStateException("Already initialized");
+ } else {
+ initialized = true;
+ }
+
+ LOG.info("initialising Isis System");
+ LOG.info("working directory: " + new File(".").getAbsolutePath());
+ LOG.info("resource stream source: " + getConfiguration().getResourceStreamSource());
+
+ localeInitializer.initLocale(getConfiguration());
+ timeZoneInitializer.initTimeZone(getConfiguration());
+
+ int splashDelay = SPLASH_DELAY_DEFAULT;
+ try {
+ TemplateImageLoader splashLoader = obtainTemplateImageLoader();
+ splashLoader.init();
+ showSplash(splashLoader);
+
+ sessionFactory = doCreateSessionFactory(deploymentType);
+
+ // temporarily make a configuration available
+ // REVIEW: would rather inject this, or perhaps even the ConfigurationBuilder
+ IsisContext.setConfiguration(getConfiguration());
+
+
+ initContext(sessionFactory);
+ sessionFactory.init();
+
+ installFixturesIfRequired();
+
+ } catch (IsisSystemException ex) {
+ LOG.error("failed to initialise", ex);
+ splashDelay = 0;
+ throw new RuntimeException(ex);
+ } finally {
+ removeSplash(splashDelay);
+ }
+ }
+
+
+ private void initContext(IsisSessionFactory sessionFactory) {
+ getDeploymentType().initContext(sessionFactory);
+ }
+
+ @Override
+ public void shutdown() {
+ LOG.info("shutting down system");
+ IsisContext.closeAllSessions();
+ }
+
+ // ///////////////////////////////////////////
+ // Hook:
+ // ///////////////////////////////////////////
+
+ /**
+ * Hook method; the returned implementation is expected to use the same general approach as the subclass itself.
+ *
+ * <p>
+ * So, for example, <tt>IsisSystemUsingInstallers</tt> uses the {@link InstallerLookup} mechanism to find its
+ * components. The corresponding <tt>ExecutionContextFactoryUsingInstallers</tt> object returned by this method
+ * should use {@link InstallerLookup} likewise.
+ */
+ protected abstract IsisSessionFactory doCreateSessionFactory(final DeploymentType deploymentType)
+ throws IsisSystemException;
+
+ // ///////////////////////////////////////////
+ // Configuration
+ // ///////////////////////////////////////////
+
+ /**
+ * Populated after {@link #init()}.
+ */
+ @Override
+ public IsisSessionFactory getSessionFactory() {
+ return sessionFactory;
+ }
+
+ // ///////////////////////////////////////////
+ // Configuration
+ // ///////////////////////////////////////////
+
+ @Override
+ public abstract IsisConfiguration getConfiguration();
+
+ // ///////////////////////////////////////////
+ // TemplateImageLoader
+ // ///////////////////////////////////////////
+
+ /**
+ * Just returns a {@link TemplateImageLoaderAwt}; subclasses may override if required.
+ */
+ protected TemplateImageLoader obtainTemplateImageLoader() {
+ return new TemplateImageLoaderAwt(getConfiguration());
+ }
+
+ // ///////////////////////////////////////////
+ // Reflector
+ // ///////////////////////////////////////////
+
+ protected abstract ObjectReflector obtainReflector(DeploymentType deploymentType) throws IsisSystemException;
+
+ // ///////////////////////////////////////////
+ // PersistenceSessionFactory
+ // ///////////////////////////////////////////
+
+ protected abstract PersistenceSessionFactory obtainPersistenceSessionFactory(DeploymentType deploymentType)
+ throws IsisSystemException;
+
+ // ///////////////////////////////////////////
+ // Fixtures (hooks)
+ // ///////////////////////////////////////////
+
+
+ /**
+ * Optional hook for appending debug information pertaining to
+ * fixtures installer if required.
+ */
+ protected void appendFixturesInstallerDebug(DebugBuilder debug) {
+ }
+
+
+ /**
+ * The {@link LogonFixture}, if any, obtained by running fixtures.
+ *
+ * <p>
+ * Intended to be used when for {@link DeploymentType#EXPLORATION exploration} (instead of an
+ * {@link ExplorationSession}) or {@link DeploymentType#PROTOTYPE prototype} deployments (saves logging in). Should
+ * be <i>ignored</i> in other {@link DeploymentType}s.
+ *
+ * <p>
+ * This implementation always returns <tt>null</tt>.
+ */
+ @Override
+ public LogonFixture getLogonFixture() {
+ return null;
+ }
+
+ /**
+ * Optional hook for installing fixtures.
+ *
+ * <p>
+ * This implementation does nothing.
+ */
+ protected void installFixturesIfRequired() throws IsisSystemException {
+ }
+
+
+ // ///////////////////////////////////////////
+ // Authentication Manager
+ // ///////////////////////////////////////////
+
+ protected abstract AuthenticationManager obtainAuthenticationManager(DeploymentType deploymentType)
+ throws IsisSystemException;
+
+ // ///////////////////////////////////////////
+ // UserProfileLoader
+ // ///////////////////////////////////////////
+
+ protected abstract UserProfileStore obtainUserProfileStore();
+
+ // ///////////////////////////////////////////
+ // Services
+ // ///////////////////////////////////////////
+
+ protected abstract List<Object> obtainServices();
+
+
+
+ // ///////////////////////////////////////////
+ // Splash
+ // ///////////////////////////////////////////
+
+ private void showSplash(TemplateImageLoader imageLoader) {
+
+ boolean vetoSplashFromConfig =
+ getConfiguration().getBoolean(SystemConstants.NOSPLASH_KEY, SystemConstants.NOSPLASH_DEFAULT);
+ if (!vetoSplashFromConfig && getDeploymentType().shouldShowSplash()) {
+ splashWindow = new SplashWindow(imageLoader);
+ }
+ }
+
+ private void removeSplash(final int delay) {
+ if (splashWindow != null) {
+ if (delay == 0) {
+ splashWindow.removeImmediately();
+ } else {
+ splashWindow.toFront();
+ splashWindow.removeAfterDelay(delay);
+ }
+ }
+ }
+
+ // ///////////////////////////////////////////
+ // debugging
+ // ///////////////////////////////////////////
+
+ private void debug(final DebugBuilder debug, final Object object) {
+ if (object instanceof DebuggableWithTitle) {
+ final DebuggableWithTitle d = (DebuggableWithTitle) object;
+ debug.appendTitle(d.debugTitle());
+ d.debugData(debug);
+ } else {
+ debug.appendln(object.toString());
+ debug.appendln("... no further debug information");
+ }
+ }
+
+ @Override
+ public DebuggableWithTitle debugSection(String selectionName) {
+ // DebugInfo deb;
+ if (selectionName.equals("Configuration")) {
+ return getConfiguration();
+ } /*
+ * else if (selectionName.equals("Overview")) { debugOverview(debug); } else if
+ * (selectionName.equals("Authenticator")) { deb = IsisContext.getAuthenticationManager(); } else if
+ * (selectionName.equals("Reflector")) { deb = IsisContext.getSpecificationLoader(); } else if
+ * (selectionName.equals("Contexts")) { deb = debugListContexts(debug); } else { deb =
+ * debugDisplayContext(selectionName, debug); }
+ */
+ return null;
+ }
+
+ private void debugDisplayContext(final String selector, final DebugBuilder debug) {
+ final IsisSession d = IsisContext.getSession(selector);
+ if (d != null) {
+ d.debugAll(debug);
+ } else {
+ debug.appendln("No context: " + selector);
+ }
+ }
+
+ private void debugListContexts(final DebugBuilder debug) {
+ final String[] contextIds = IsisContext.getInstance().allSessionIds();
+ for (int i = 0; i < contextIds.length; i++) {
+ debug.appendln(contextIds[i]);
+ debug.appendln("-----");
+ final IsisSession d = IsisContext.getSession(contextIds[i]);
+ d.debug(debug);
+ debug.appendln();
+ }
+ }
+
+ @Override
+ public String[] debugSectionNames() {
+ final String[] general =
+ new String[] { "Overview", "Authenticator", "Configuration", "Reflector", "Requests", "Contexts" };
+ final String[] contextIds = IsisContext.getInstance().allSessionIds();
+ final String[] combined = new String[general.length + contextIds.length];
+ System.arraycopy(general, 0, combined, 0, general.length);
+ System.arraycopy(contextIds, 0, combined, general.length, contextIds.length);
+ return combined;
+ }
+
+ private void debugOverview(final DebugBuilder debug) {
+ try {
+ debug.appendln(AboutIsis.getFrameworkName());
+ debug.appendln(AboutIsis.getFrameworkVersion());
+ if (AboutIsis.getApplicationName() != null) {
+ debug.appendln("application: " + AboutIsis.getApplicationName());
+ }
+ if (AboutIsis.getApplicationVersion() != null) {
+ debug.appendln("version" + AboutIsis.getApplicationVersion());
+ }
+
+ final String user = System.getProperty("user.name");
+ final String system =
+ System.getProperty("os.name") + " (" + System.getProperty("os.arch") + ") "
+ + System.getProperty("os.version");
+ final String java = System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version");
+ debug.appendln("user: " + user);
+ debug.appendln("os: " + system);
+ debug.appendln("java: " + java);
+ debug.appendln("working directory: " + new File(".").getAbsolutePath());
+
+ debug.appendTitle("System Installer");
+ appendFixturesInstallerDebug(debug);
+
+ debug.appendTitle("System Components");
+ debug.appendln("Authentication manager", IsisContext.getAuthenticationManager().getClass().getName());
+ debug.appendln("Configuration", getConfiguration().getClass().getName());
+
+ final DebuggableWithTitle[] inf = IsisContext.debugSystem();
+ for (int i = 0; i < inf.length; i++) {
+ if (inf[i] != null) {
+ inf[i].debugData(debug);
+ }
+ }
+ } catch (RuntimeException e) {
+ debug.appendException(e);
+ }
+ }
+
+
+}
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/SystemConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/SystemConstants.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/SystemConstants.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/SystemConstants.java Thu Apr 28 23:05:40 2011
@@ -29,16 +29,16 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoaderInstaller;
-import org.apache.isis.runtimes.dflt.runtime.fixturesinstaller.FixturesInstaller;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceMechanismInstaller;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtimes.dflt.runtime.persistence.services.ServicesInstaller;
-import org.apache.isis.runtimes.dflt.runtime.remoting.ClientConnectionInstaller;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileStore;
+import org.apache.isis.core.runtime.userprofile.UserProfileStore;
+import org.apache.isis.runtimes.dflt.runtime.fixtures.FixturesInstaller;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.ClientConnectionInstaller;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.EmbeddedWebServerInstaller;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstaller;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
+import org.apache.isis.runtimes.dflt.runtime.services.ServicesInstaller;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileStoreInstaller;
import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer;
-import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewerInstaller;
-import org.apache.isis.runtimes.dflt.runtime.web.EmbeddedWebServerInstaller;
public final class SystemConstants {
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContext.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContext.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContext.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java Thu Apr 28 23:05:40 2011
@@ -17,31 +17,33 @@
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.context;
+package org.apache.isis.runtimes.dflt.runtime.system.context;
import java.util.List;
+import org.apache.isis.applib.adapters.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.TransactionScopedComponent;
import org.apache.isis.core.commons.config.IsisConfigurationException;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.commons.debug.DebugList;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSession;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransaction;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifier;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfile;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransaction;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
import org.apache.log4j.Logger;
/**
@@ -426,6 +428,16 @@ public abstract class IsisContext implem
}
/**
+ * Convenience method.
+ *
+ * @see IsisSession#getUserProfile()
+ * @see UserProfile#getLocalization()
+ */
+ public static Localization getLocalization() {
+ return getUserProfile().getLocalization();
+ }
+
+ /**
* Convenience methods
*
* @see IsisSession#getPersistenceSession()
@@ -518,4 +530,5 @@ public abstract class IsisContext implem
debug.appendln("context ", this);
}
+
}
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextMultiUser.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextMultiUser.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextMultiUser.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextMultiUser.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextMultiUser.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextMultiUser.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextMultiUser.java Thu Apr 28 23:05:40 2011
@@ -18,10 +18,10 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.context;
+package org.apache.isis.runtimes.dflt.runtime.system.context;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSession;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
/**
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextPipe.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextPipe.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextPipe.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextPipe.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextPipe.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextPipe.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextPipe.java Thu Apr 28 23:05:40 2011
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.context;
+package org.apache.isis.runtimes.dflt.runtime.system.context;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSession;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
/**
* A specialised IsisContext implementation that provides two sets of components: one for the server; and one for the
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextStatic.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextStatic.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextStatic.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextStatic.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextStatic.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextStatic.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextStatic.java Thu Apr 28 23:05:40 2011
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.context;
+package org.apache.isis.runtimes.dflt.runtime.system.context;
import org.apache.isis.applib.maybe.Maybe;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSession;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
import com.google.inject.Injector;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/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?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextThreadLocal.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextThreadLocal.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java Thu Apr 28 23:05:40 2011
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.context;
+package org.apache.isis.runtimes.dflt.runtime.system.context;
import java.util.HashMap;
import java.util.Map;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSession;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
import org.apache.log4j.Logger;
/**
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/AdapterManager.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManager.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/AdapterManager.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/AdapterManager.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManager.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManager.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/AdapterManager.java Thu Apr 28 23:05:40 2011
@@ -18,10 +18,11 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapterLookup;
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -38,7 +39,7 @@ import org.apache.isis.core.metamodel.ad
* Each POJO is given an {@link ObjectAdapter adapter} so that the framework can work with the POJOs even though
* it does not understand their types. Each POJO maps to an {@link ObjectAdapter adapter} and these are reused.
*/
-public interface AdapterManager extends AdapterManagerLookup, Injectable, AdapterMap {
+public interface AdapterManager extends ObjectAdapterLookup, Injectable, AdapterMap {
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/ObjectFactory.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectfactory/ObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/ObjectFactory.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/ObjectFactory.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectfactory/ObjectFactory.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectfactory/ObjectFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/ObjectFactory.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import org.apache.isis.core.commons.components.SessionScopedComponent;
import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/OidGenerator.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGenerator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/OidGenerator.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/OidGenerator.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGenerator.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGenerator.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/OidGenerator.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.commons.components.SessionScopedComponent;
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
import org.apache.isis.core.metamodel.adapter.oid.stringable.hex.OidStringifierHex;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceQuery.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQuery.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceQuery.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceQuery.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQuery.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQuery.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceQuery.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.query;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import org.apache.isis.applib.query.Query;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSession.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSession.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSession.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java Thu Apr 28 23:05:40 2011
@@ -18,21 +18,18 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.commons.components.SessionScopedComponent;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectFactory;
-import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionManagerAware;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManagerAware;
public interface PersistenceSession extends
@@ -89,11 +86,11 @@ public interface PersistenceSession exte
OidGenerator getOidGenerator();
/**
- * The configured {@link AdapterFactory}.
+ * The configured {@link ObjectAdapterFactory}.
*
* @return
*/
- AdapterFactory getAdapterFactory();
+ ObjectAdapterFactory getAdapterFactory();
/**
* The configured {@link ObjectFactory}.
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionAdaptedServiceManager.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionAdaptedServiceManager.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionAdaptedServiceManager.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionAdaptedServiceManager.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionAdaptedServiceManager.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionAdaptedServiceManager.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionAdaptedServiceManager.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import java.util.List;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionContainer.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionContainer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionContainer.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionContainer.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionContainer.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionContainer.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionContainer.java Thu Apr 28 23:05:40 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.query.Query;
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.runtimes.dflt.runtime.persistence.UnsupportedFindException;
/**
* PersistenceSession as it appears to most typical client-side code.
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionFactory.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/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?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionFactory.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionFactory.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionFactory.java Thu Apr 28 23:05:40 2011
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import java.util.List;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
-import org.apache.isis.runtimes.dflt.runtime.persistence.internal.RuntimeContextFromSession;
+import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactoryDelegate;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
/**
@@ -45,7 +45,7 @@ public interface PersistenceSessionFacto
* Make available when creating {@link PersistenceSession}s.
*
* <p>
- * Needed for the {@link RuntimeContextFromSession}.
+ * Needed for the <tt>RuntimeContextFromSession</tt>.
*/
SpecificationLoader getSpecificationLoader();
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionForceReloader.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionForceReloader.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionForceReloader.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionForceReloader.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionForceReloader.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionForceReloader.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionForceReloader.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionHydrator.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionHydrator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionHydrator.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionHydrator.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionHydrator.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionHydrator.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionHydrator.java Thu Apr 28 23:05:40 2011
@@ -18,15 +18,13 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectFactory;
public interface PersistenceSessionHydrator extends Injectable {
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionTestSupport.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionTestSupport.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionTestSupport.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionTestSupport.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionTestSupport.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionTestSupport.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionTestSupport.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
/**
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionTransactionManagement.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionTransactionManagement.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionTransactionManagement.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionTransactionManagement.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionTransactionManagement.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionTransactionManagement.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionTransactionManagement.java Thu Apr 28 23:05:40 2011
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence;
+package org.apache.isis.runtimes.dflt.runtime.system.persistence;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.Dirtiable;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
/**
* As called by the {@link IsisTransactionManager}.
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSession.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSession.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSession.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSession.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSession.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSession.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSession.java Thu Apr 28 23:05:40 2011
@@ -18,17 +18,17 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.session;
+package org.apache.isis.runtimes.dflt.runtime.system.session;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.SessionScopedComponent;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
import org.apache.isis.runtimes.dflt.runtime.system.IsisSystem;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransaction;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfile;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransaction;
/**
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionDefault.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionDefault.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionDefault.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionDefault.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionDefault.java Thu Apr 28 23:05:40 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.session;
+package org.apache.isis.runtimes.dflt.runtime.system.session;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
import static org.hamcrest.CoreMatchers.is;
@@ -36,11 +36,11 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransaction;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfile;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransaction;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.log4j.Logger;
/**
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/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?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionFactory.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java Thu Apr 28 23:05:40 2011
@@ -18,10 +18,10 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.session;
-
-import java.util.List;
+package org.apache.isis.runtimes.dflt.runtime.system.session;
+import java.util.List;
+
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -29,12 +29,10 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtimes.dflt.runtime.system.ContextCategory;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
/**
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactoryAbstract.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionFactoryAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactoryAbstract.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactoryAbstract.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionFactoryAbstract.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionFactoryAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactoryAbstract.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.session;
+package org.apache.isis.runtimes.dflt.runtime.system.session;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -35,12 +35,12 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookup;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfile;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
/**
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactoryDefault.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionFactoryDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactoryDefault.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactoryDefault.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionFactoryDefault.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/IsisSessionFactoryDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactoryDefault.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.session;
+package org.apache.isis.runtimes.dflt.runtime.system.session;
import java.util.List;
@@ -27,9 +27,9 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
/**
* As its superclass, but provides a default for some of more basic components (that
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/SessionFactoryException.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/SessionFactoryException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/SessionFactoryException.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/SessionFactoryException.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/SessionFactoryException.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/session/SessionFactoryException.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/SessionFactoryException.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.session;
+package org.apache.isis.runtimes.dflt.runtime.system.session;
public class SessionFactoryException extends Exception {
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransaction.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransaction.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransaction.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransaction.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransaction.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransaction.java Thu Apr 28 23:05:40 2011
@@ -18,11 +18,9 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.transaction;
+package org.apache.isis.runtimes.dflt.runtime.system.transaction;
import org.apache.isis.core.commons.components.TransactionScopedComponent;
-import org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifier;
/**
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransactionManager.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManager.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransactionManager.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransactionManager.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManager.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManager.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransactionManager.java Thu Apr 28 23:05:40 2011
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.transaction;
+package org.apache.isis.runtimes.dflt.runtime.system.transaction;
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.commons.components.SessionScopedComponent;
import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSession;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
public interface IsisTransactionManager extends SessionScopedComponent, Injectable {
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransactionManagerAware.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManagerAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransactionManagerAware.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransactionManagerAware.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManagerAware.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManagerAware.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/IsisTransactionManagerAware.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,8 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.transaction;
+package org.apache.isis.runtimes.dflt.runtime.system.transaction;
+
public interface IsisTransactionManagerAware {
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/MessageBroker.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBroker.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/MessageBroker.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/MessageBroker.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBroker.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBroker.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/MessageBroker.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker;
+package org.apache.isis.runtimes.dflt.runtime.system.transaction;
import java.util.List;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/TransactionalClosure.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosure.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/TransactionalClosure.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/TransactionalClosure.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosure.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosure.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/TransactionalClosure.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.transaction;
+package org.apache.isis.runtimes.dflt.runtime.system.transaction;
public interface TransactionalClosure {