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 [8/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/system/transaction/TransactionalClosureWithReturn.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureWithReturn.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/TransactionalClosureWithReturn.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/TransactionalClosureWithReturn.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureWithReturn.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/TransactionalClosureWithReturn.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/TransactionalClosureWithReturn.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 TransactionalClosureWithReturn<T> {
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/UpdateNotifier.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifier.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/UpdateNotifier.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/UpdateNotifier.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifier.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/updatenotifier/UpdateNotifier.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/transaction/UpdateNotifier.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier;
+package org.apache.isis.runtimes.dflt.runtime.system.transaction;
import java.util.List;
Added: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemdependencyinjector/SystemDependencyInjector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemdependencyinjector/SystemDependencyInjector.java?rev=1097654&view=auto
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemdependencyinjector/SystemDependencyInjector.java (added)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemdependencyinjector/SystemDependencyInjector.java Thu Apr 28 23:05:40 2011
@@ -0,0 +1,31 @@
+/**
+ * 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.systemdependencyinjector;
+
+/**
+ *
+ *
+ * @version $Rev$ $Date$
+ */
+public interface SystemDependencyInjector {
+
+ /**
+ * Injects self into candidate
+ */
+ public abstract <T> T injectDependenciesInto(T candidate);
+
+}
\ No newline at end of file
Added: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemdependencyinjector/SystemDependencyInjectorAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemdependencyinjector/SystemDependencyInjectorAware.java?rev=1097654&view=auto
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemdependencyinjector/SystemDependencyInjectorAware.java (added)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemdependencyinjector/SystemDependencyInjectorAware.java Thu Apr 28 23:05:40 2011
@@ -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.runtimes.dflt.runtime.systemdependencyinjector;
+
+
+
+
+public interface SystemDependencyInjectorAware {
+
+ void setSystemDependencyInjector(final SystemDependencyInjector dependencyInjector);
+}
+
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemAbstract.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemAbstract.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemAbstract.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemAbstract.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemAbstract.java Thu Apr 28 23:05:40 2011
@@ -17,58 +17,33 @@
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.system;
-
-import java.io.File;
-import java.util.List;
-
-import org.apache.log4j.Logger;
+package org.apache.isis.runtimes.dflt.runtime.systemusinginstallers;
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.runtimes.dflt.runtime.authentication.standard.exploration.ExplorationSession;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.fixturesinstaller.FixturesInstaller;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
-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.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.DeploymentType;
+import org.apache.isis.runtimes.dflt.runtime.system.IsisSystemException;
+import org.apache.isis.runtimes.dflt.runtime.system.IsisSystemFixturesHookAbstract;
+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.userprofile.UserProfileStore;
+import org.apache.log4j.Logger;
/**
*
*/
-public abstract class IsisSystemAbstract implements IsisSystem {
+public abstract class IsisSystemAbstract extends IsisSystemFixturesHookAbstract {
public static final Logger LOG = Logger.getLogger(IsisSystemAbstract.class);
- private static final int SPLASH_DELAY_DEFAULT = 6;
-
- private final IsisLocaleInitializer localeInitializer;
- private final IsisTimeZoneInitializer timeZoneInitializer;
- private final DeploymentType deploymentType;
-
- private SplashWindow splashWindow;
-
private FixturesInstaller fixtureInstaller;
- private boolean initialized = false;
-
- private IsisSessionFactory sessionFactory;
-
private LogonFixture logonFixture;
// ///////////////////////////////////////////
@@ -76,76 +51,20 @@ public abstract class IsisSystemAbstract
// ///////////////////////////////////////////
public IsisSystemAbstract(final DeploymentType deploymentType) {
- this(deploymentType, new IsisLocaleInitializer(), new IsisTimeZoneInitializer());
+ super(deploymentType, new IsisLocaleInitializer(), new IsisTimeZoneInitializer());
}
public IsisSystemAbstract(final DeploymentType deploymentType, final IsisLocaleInitializer localeInitializer,
final IsisTimeZoneInitializer timeZoneInitializer) {
- this.deploymentType = deploymentType;
- this.localeInitializer = localeInitializer;
- this.timeZoneInitializer = timeZoneInitializer;
+ super(deploymentType, localeInitializer, 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 installFixturesIfRequired() throws IsisSystemException {
+ protected void installFixturesIfRequired() throws IsisSystemException {
// some deployment types (eg CLIENT) do not support installing fixtures
// instead, any fixtures should be installed when server boots up.
- if (!deploymentType.canInstallFixtures()) {
+ if (!getDeploymentType().canInstallFixtures()) {
return;
}
@@ -159,7 +78,7 @@ public abstract class IsisSystemAbstract
try {
// only allow logon fixtures if not in production mode.
- if (!deploymentType.isProduction()) {
+ if (!getDeploymentType().isProduction()) {
logonFixture = fixtureInstaller.getLogonFixture();
}
} finally {
@@ -167,77 +86,10 @@ public abstract class IsisSystemAbstract
}
}
- protected boolean isNoop(FixturesInstaller candidate) {
+ private boolean isNoop(FixturesInstaller candidate) {
return candidate == null || (fixtureInstaller instanceof Noop);
}
- 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
@@ -255,25 +107,6 @@ public abstract class IsisSystemAbstract
protected abstract FixturesInstaller obtainFixturesInstaller() throws IsisSystemException;
// ///////////////////////////////////////////
- // Authentication Manager
- // ///////////////////////////////////////////
-
- protected abstract AuthenticationManager obtainAuthenticationManager(DeploymentType deploymentType)
- throws IsisSystemException;
-
- // ///////////////////////////////////////////
- // UserProfileLoader
- // ///////////////////////////////////////////
-
- protected abstract UserProfileStore obtainUserProfileStore();
-
- // ///////////////////////////////////////////
- // Services
- // ///////////////////////////////////////////
-
- protected abstract List<Object> obtainServices();
-
- // ///////////////////////////////////////////
// Fixtures Installer
// ///////////////////////////////////////////
@@ -294,129 +127,10 @@ public abstract class IsisSystemAbstract
return logonFixture;
}
- // ///////////////////////////////////////////
- // Splash
- // ///////////////////////////////////////////
-
- private void showSplash(TemplateImageLoader imageLoader) {
-
- boolean vetoSplashFromConfig =
- getConfiguration().getBoolean(SystemConstants.NOSPLASH_KEY, SystemConstants.NOSPLASH_DEFAULT);
- if (!vetoSplashFromConfig && getDeploymentType().shouldShowSplash()) {
- splashWindow = new SplashWindow(imageLoader);
- }
- }
-
- private void removeSplash(final int delay) {
- if (splashWindow != null) {
- if (delay == 0) {
- splashWindow.removeImmediately();
- } else {
- splashWindow.toFront();
- splashWindow.removeAfterDelay(delay);
- }
- }
- }
-
- // ///////////////////////////////////////////
- // debugging
- // ///////////////////////////////////////////
-
- private void debug(final 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");
- debug.appendln("Fixture Installer", fixtureInstaller == null ? "none" : fixtureInstaller.getClass()
- .getName());
-
- debug.appendTitle("System Components");
- debug.appendln("Authentication manager", IsisContext.getAuthenticationManager().getClass().getName());
- debug.appendln("Configuration", getConfiguration().getClass().getName());
-
- final 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);
- }
+ protected void appendFixturesInstallerDebug(DebugBuilder debug) {
+ debug.appendln("Fixture Installer", fixtureInstaller == null ? "none" : fixtureInstaller.getClass()
+ .getName());
}
}
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemThatUsesInstallersFactory.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemThatUsesInstallersFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemThatUsesInstallersFactory.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemThatUsesInstallersFactory.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemThatUsesInstallersFactory.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemThatUsesInstallersFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemThatUsesInstallersFactory.java Thu Apr 28 23:05:40 2011
@@ -18,10 +18,13 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.system;
+package org.apache.isis.runtimes.dflt.runtime.systemusinginstallers;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
-import org.apache.isis.runtimes.dflt.runtime.system.installers.IsisSystemUsingInstallers;
+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.system.IsisSystem;
+import org.apache.isis.runtimes.dflt.runtime.system.IsisSystemFactory;
+import org.apache.isis.runtimes.dflt.runtime.systemdependencyinjector.SystemDependencyInjector;
import com.google.inject.Inject;
@@ -73,7 +76,7 @@ public class IsisSystemThatUsesInstaller
// Dependencies (injected or defaulted in constructor)
// //////////////////////////////////////////////////////////
- public InstallerLookup getInstallerLookup() {
+ public SystemDependencyInjector getInstallerLookup() {
return installerLookup;
}
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemUsingInstallers.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/installers/IsisSystemUsingInstallers.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemUsingInstallers.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemUsingInstallers.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/installers/IsisSystemUsingInstallers.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/installers/IsisSystemUsingInstallers.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemUsingInstallers.java Thu Apr 28 23:05:40 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.system.installers;
+package org.apache.isis.runtimes.dflt.runtime.systemusinginstallers;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
@@ -37,23 +37,23 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoaderInstaller;
-import org.apache.isis.runtimes.dflt.runtime.fixturesinstaller.FixturesInstaller;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceMechanismInstaller;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
+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.InstallerLookup;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.ClientConnectionInstaller;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
import org.apache.isis.runtimes.dflt.runtime.persistence.internal.RuntimeContextFromSession;
-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.session.IsisSessionFactory;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactoryDefault;
+import org.apache.isis.runtimes.dflt.runtime.services.ServicesInstaller;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
-import org.apache.isis.runtimes.dflt.runtime.system.IsisSystemAbstract;
import org.apache.isis.runtimes.dflt.runtime.system.IsisSystemException;
import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactoryDefault;
+import org.apache.isis.runtimes.dflt.runtime.systemdependencyinjector.SystemDependencyInjector;
import org.apache.isis.runtimes.dflt.runtime.transaction.facetdecorator.standard.TransactionFacetDecoratorInstaller;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileLoader;
import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileLoaderDefault;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileStore;
import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileStoreInstaller;
import org.apache.log4j.Logger;
@@ -88,7 +88,7 @@ public class IsisSystemUsingInstallers e
/**
* As per {@link #IsisSystemUsingInstallers(DeploymentType, InstallerLookup) constructor}.
*/
- public InstallerLookup getInstallerLookup() {
+ public SystemDependencyInjector getInstallerLookup() {
return installerLookup;
}
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionAbstract.java Thu Apr 28 23:05:40 2011
@@ -28,8 +28,10 @@ import static org.apache.isis.core.commo
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.lang.ToString;
-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.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;
public abstract class IsisTransactionAbstract implements IsisTransaction {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionDefault.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionDefault.java Thu Apr 28 23:05:40 2011
@@ -20,9 +20,10 @@
package org.apache.isis.runtimes.dflt.runtime.transaction;
-import org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageBroker;
+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.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageBrokerDefault;
-import org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifierDefault;
public class IsisTransactionDefault extends IsisTransactionAbstract {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManagerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManagerAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManagerAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionManagerAbstract.java Thu Apr 28 23:05:40 2011
@@ -22,10 +22,15 @@ package org.apache.isis.runtimes.dflt.ru
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSession;
-import org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageBroker;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
+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.IsisTransactionManagerAware;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.TransactionalClosure;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.TransactionalClosureWithReturn;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
import org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageBrokerDefault;
-import org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifierDefault;
import static org.hamcrest.CoreMatchers.is;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionUtils.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionUtils.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionUtils.java Thu Apr 28 23:05:40 2011
@@ -23,6 +23,7 @@ package org.apache.isis.runtimes.dflt.ru
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.runtimes.dflt.runtime.transaction.facets.CollectionClearFacetWrapTransaction;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureAbstract.java Thu Apr 28 23:05:40 2011
@@ -19,6 +19,8 @@
package org.apache.isis.runtimes.dflt.runtime.transaction;
+
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.TransactionalClosure;
/**
* Convenience adapter providing no-op implementations of {@link #onSuccess()} and
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureWithReturnAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureWithReturnAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureWithReturnAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/TransactionalClosureWithReturnAbstract.java Thu Apr 28 23:05:40 2011
@@ -19,6 +19,8 @@
package org.apache.isis.runtimes.dflt.runtime.transaction;
+
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.TransactionalClosureWithReturn;
/**
* Convenience adapter providing no-op implementations of {@link #onSuccess()} and
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java Thu Apr 28 23:05:40 2011
@@ -26,9 +26,9 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacetAbstract;
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.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.runtimes.dflt.runtime.transaction.TransactionalClosureWithReturnAbstract;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java Thu Apr 28 23:05:40 2011
@@ -24,9 +24,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacetAbstract;
-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.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.runtimes.dflt.runtime.transaction.TransactionalClosureAbstract;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java Thu Apr 28 23:05:40 2011
@@ -24,9 +24,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacetAbstract;
-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.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.runtimes.dflt.runtime.transaction.TransactionalClosureAbstract;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java Thu Apr 28 23:05:40 2011
@@ -24,9 +24,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;
-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.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.runtimes.dflt.runtime.transaction.TransactionalClosureAbstract;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java Thu Apr 28 23:05:40 2011
@@ -24,9 +24,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacetAbstract;
-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.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.runtimes.dflt.runtime.transaction.TransactionalClosureAbstract;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java Thu Apr 28 23:05:40 2011
@@ -24,9 +24,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacetAbstract;
-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.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.runtimes.dflt.runtime.transaction.TransactionalClosureAbstract;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBrokerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBrokerDefault.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBrokerDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBrokerDefault.java Thu Apr 28 23:05:40 2011
@@ -28,6 +28,7 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.StringUtils;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker;
public class MessageBrokerDefault implements MessageBroker, DebuggableWithTitle {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBrokerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBrokerInstaller.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBrokerInstaller.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/MessageBrokerInstaller.java Thu Apr 28 23:05:40 2011
@@ -21,6 +21,7 @@
package org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker;
import org.apache.isis.core.commons.components.Installer;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker;
public interface MessageBrokerInstaller extends Installer {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/package-info.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/package-info.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/messagebroker/package-info.java Thu Apr 28 23:05:40 2011
@@ -30,6 +30,6 @@
* opportunity for more exotic remoting mechanisms to send out warning messages,
* for example JMS.
*
- * @see org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifier
+ * @see org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier
*/
package org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker;
\ No newline at end of file
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/package-info.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/package-info.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/package-info.java Thu Apr 28 23:05:40 2011
@@ -19,7 +19,7 @@
/**
- * These interfaces are extended by {@link org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession}
+ * These interfaces are extended by {@link org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession}
* and not intended to be implemented directly.
*/
package org.apache.isis.runtimes.dflt.runtime.transaction;
\ No newline at end of file
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierAbstract.java Thu Apr 28 23:05:40 2011
@@ -20,6 +20,7 @@
package org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierAware.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierAware.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierAware.java Thu Apr 28 23:05:40 2011
@@ -19,6 +19,8 @@
package org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier;
+
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
public interface UpdateNotifierAware {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/package-info.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/package-info.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/package-info.java Thu Apr 28 23:05:40 2011
@@ -31,6 +31,6 @@
* opportunity for more exotic remoting mechanisms to send out notifications
* of changes, for example JMS.
*
- * @see org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageBroker
+ * @see org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker
*/
package org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier;
\ No newline at end of file
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java Thu Apr 28 23:05:40 2011
@@ -26,9 +26,12 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-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.session.IsisSession;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfileStore;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
import org.apache.log4j.Logger;
/**
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileStoreInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileStoreInstaller.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileStoreInstaller.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileStoreInstaller.java Thu Apr 28 23:05:40 2011
@@ -22,6 +22,7 @@ package org.apache.isis.runtimes.dflt.ru
import org.apache.isis.core.commons.components.Installer;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.runtime.userprofile.UserProfileStore;
public interface UserProfileStoreInstaller extends Installer {
Added: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfilesDebugUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfilesDebugUtil.java?rev=1097654&view=auto
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfilesDebugUtil.java (added)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfilesDebugUtil.java Thu Apr 28 23:05:40 2011
@@ -0,0 +1,108 @@
+/*
+ * 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.userprofile;
+
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
+import org.apache.isis.core.metamodel.services.ServiceUtil;
+import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+
+/**
+ * Introduced in order to remove the dependency between {@link UserProfile} and {@link PerspectiveEntry} on
+ * <tt>runtimes:dflt</tt>.
+ */
+public final class UserProfilesDebugUtil {
+
+ public static DebuggableWithTitle asDebuggableWithTitle(final UserProfile userProfile) {
+ return new DebuggableWithTitle() {
+
+ @Override
+ public void debugData(DebugBuilder debug) {
+ debug.appendTitle("Options");
+ debug.indent();
+ debug.append(userProfile.getOptions());
+ debug.unindent();
+
+ debug.appendTitle("Perspectives");
+ for (PerspectiveEntry entry : userProfile.getEntries()) {
+ asDebuggableWithTitle(entry).debugData(debug);
+ }
+ }
+
+ @Override
+ public String debugTitle() {
+ return toString();
+ }
+ };
+ }
+
+
+ public static DebuggableWithTitle asDebuggableWithTitle(final PerspectiveEntry perspectiveEntry) {
+ return new DebuggableWithTitle() {
+
+ @Override
+ public void debugData(DebugBuilder debug) {
+ debug.appendln("Name", perspectiveEntry.getName());
+ debug.blankLine();
+ debug.appendTitle("Services (Ids)");
+ debug.indent();
+ for (Object service : perspectiveEntry.getServices()) {
+ debug.appendln(ServiceUtil.id(service));
+ }
+ debug.unindent();
+
+ debug.blankLine();
+ debug.appendTitle("Objects");
+ debug.indent();
+ AdapterMap adapterMap = getAdapterMap();
+ for (Object obj : perspectiveEntry.getObjects()) {
+ debug.appendln(adapterMap.adapterFor(obj).toString());
+ }
+ debug.unindent();
+ }
+
+ @Override
+ public String debugTitle() {
+ return "Perspective";
+ }
+ };
+ }
+
+ /////////////////////////////////////////////////////////
+ // Dependencies (from Context)
+ /////////////////////////////////////////////////////////
+
+ private static AdapterMap getAdapterMap() {
+ return getPersistenceSession().getAdapterManager();
+ }
+
+ protected static PersistenceSession getPersistenceSession() {
+ return IsisContext.getPersistenceSession();
+ }
+
+
+}
+
+
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewer.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewer.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewer.java Thu Apr 28 23:05:40 2011
@@ -22,8 +22,8 @@ package org.apache.isis.runtimes.dflt.ru
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderAware;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookupAware;
-import org.apache.isis.runtimes.dflt.runtime.web.WebAppSpecification;
+import org.apache.isis.runtimes.dflt.runtime.systemdependencyinjector.SystemDependencyInjectorAware;
+import org.apache.isis.runtimes.dflt.runtime.viewer.web.WebAppSpecification;
/**
@@ -33,7 +33,7 @@ import org.apache.isis.runtimes.dflt.run
* The mechanism may be realized as a user interface (for example the DnD viewer or HTML viewer) but might
* also be an abstract 'remoting' viewer of sockets or HTTP servlet requests.
*/
-public interface IsisViewer extends ApplicationScopedComponent, InstallerLookupAware, IsisConfigurationBuilderAware {
+public interface IsisViewer extends ApplicationScopedComponent, SystemDependencyInjectorAware, IsisConfigurationBuilderAware {
/**
* Provide requirement for running a viewer from within an embedded web container.
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerAbstract.java Thu Apr 28 23:05:40 2011
@@ -28,13 +28,15 @@ import org.apache.isis.core.commons.ensu
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookupAware;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookup;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookupAware;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.system.IsisSystem;
import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
-import org.apache.isis.runtimes.dflt.runtime.web.WebAppSpecification;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.systemdependencyinjector.SystemDependencyInjector;
+import org.apache.isis.runtimes.dflt.runtime.systemdependencyinjector.SystemDependencyInjectorAware;
+import org.apache.isis.runtimes.dflt.runtime.viewer.web.WebAppSpecification;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -48,7 +50,7 @@ public abstract class IsisViewerAbstract
*/
private DeploymentType deploymentType;
- private InstallerLookup installerLookup;
+ private SystemDependencyInjector systemDependencyInjector;
private IsisConfigurationBuilder isisConfigurationBuilder;
private IsisSystem system; // never written to!!!
@@ -118,15 +120,15 @@ public abstract class IsisViewerAbstract
// ////////////////////////////////////////////////////////////////
protected void ensureDependenciesInjected() {
- Ensure.ensureThatState(installerLookup, is(not(nullValue())));
+ Ensure.ensureThatState(systemDependencyInjector, is(not(nullValue())));
Ensure.ensureThatState(isisConfigurationBuilder, is(not(nullValue())));
}
/**
- * Injected by virtue of being {@link InstallerLookupAware}.
+ * Injected by virtue of being {@link SystemDependencyInjectorAware}.
*/
- public void setInstallerLookup(final InstallerLookup installerLookup) {
- this.installerLookup = installerLookup;
+ public void setSystemDependencyInjector(SystemDependencyInjector dependencyInjector) {
+ this.systemDependencyInjector = dependencyInjector;
}
protected IsisConfigurationBuilder getConfigurationBuilder() {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerNoop.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerNoop.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/IsisViewerNoop.java Thu Apr 28 23:05:40 2011
@@ -22,8 +22,9 @@ package org.apache.isis.runtimes.dflt.ru
import org.apache.isis.core.commons.components.Noop;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
-import org.apache.isis.runtimes.dflt.runtime.web.WebAppSpecification;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookup;
+import org.apache.isis.runtimes.dflt.runtime.systemdependencyinjector.SystemDependencyInjector;
+import org.apache.isis.runtimes.dflt.runtime.viewer.web.WebAppSpecification;
public class IsisViewerNoop implements IsisViewer, Noop {
@@ -31,19 +32,22 @@ public class IsisViewerNoop implements I
public void shutdown() {}
- public void setInstallerLookup(InstallerLookup installerLookup) {
- }
public void setConfigurationBuilder(IsisConfigurationBuilder configurationLoader) {
}
- public boolean bootstrapsSystem() {
+ @Override
+ public void setSystemDependencyInjector(SystemDependencyInjector dependencyInjector) {
+ }
+
+ public boolean bootstrapsSystem() {
return false;
}
public WebAppSpecification getWebAppSpecification() {
return null;
- }
+ }
+
}
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/AbstractServletOrFilterMapping.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/AbstractServletOrFilterMapping.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/AbstractServletOrFilterMapping.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/AbstractServletOrFilterMapping.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/AbstractServletOrFilterMapping.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/AbstractServletOrFilterMapping.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/AbstractServletOrFilterMapping.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.web;
+package org.apache.isis.runtimes.dflt.runtime.viewer.web;
import java.util.ArrayList;
import java.util.Arrays;
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/FilterSpecification.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/FilterSpecification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/FilterSpecification.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/FilterSpecification.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/FilterSpecification.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/FilterSpecification.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/FilterSpecification.java Thu Apr 28 23:05:40 2011
@@ -18,11 +18,12 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.web;
+package org.apache.isis.runtimes.dflt.runtime.viewer.web;
import java.util.Map;
+
public final class FilterSpecification extends AbstractServletOrFilterMapping {
/**
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/ServletSpecification.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/ServletSpecification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/ServletSpecification.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/ServletSpecification.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/ServletSpecification.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/ServletSpecification.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/ServletSpecification.java Thu Apr 28 23:05:40 2011
@@ -18,12 +18,13 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.web;
+package org.apache.isis.runtimes.dflt.runtime.viewer.web;
import java.util.Map;
+
public final class ServletSpecification extends AbstractServletOrFilterMapping {
Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/WebAppSpecification.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/WebAppSpecification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/WebAppSpecification.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/WebAppSpecification.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/WebAppSpecification.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/WebAppSpecification.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/viewer/web/WebAppSpecification.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.web;
+package org.apache.isis.runtimes.dflt.runtime.viewer.web;
import java.util.ArrayList;
import java.util.Collections;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/EmbeddedWebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/EmbeddedWebServer.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/EmbeddedWebServer.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/EmbeddedWebServer.java Thu Apr 28 23:05:40 2011
@@ -21,6 +21,7 @@
package org.apache.isis.runtimes.dflt.runtime.web;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.runtimes.dflt.runtime.viewer.web.WebAppSpecification;
public interface EmbeddedWebServer extends ApplicationScopedComponent {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/EmbeddedWebServerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/EmbeddedWebServerAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/EmbeddedWebServerAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/web/EmbeddedWebServerAbstract.java Thu Apr 28 23:05:40 2011
@@ -26,7 +26,8 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.viewer.web.WebAppSpecification;
public abstract class EmbeddedWebServerAbstract implements EmbeddedWebServer {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties Thu Apr 28 23:05:40 2011
@@ -46,10 +46,10 @@ org.apache.isis.viewer.restful.viewer.em
org.apache.isis.core.runtime.imageloader.awt.TemplateImageLoaderAwtInstaller # "awt"
# fixture loaders
-org.apache.isis.runtimes.dflt.runtime.fixturesinstaller.config.FixturesFromConfiguration "configuration"
+org.apache.isis.runtimes.dflt.runtime.fixtures.FixturesInstallerFromConfiguration "configuration"
# services
-org.apache.isis.runtimes.dflt.runtime.persistence.services.config.ServicesFromConfiguration # "configuration"
+org.apache.isis.runtimes.dflt.runtime.services.ServicesInstallerFromConfiguration # "configuration"
# objectstores
org.apache.isis.runtimes.dflt.objectstores.dflt.InMemoryPersistenceMechanismInstaller # "in-memory"
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/site/site.xml?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/site/site.xml (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/site/site.xml Thu Apr 28 23:05:40 2011
@@ -14,7 +14,9 @@
<menu name="Default Runtime">
<item name="Implementation" href="../runtime/index.html" />
<item name="Objectstores" href="../objectstores/index.html" />
+ <item name="Profilestores" href="../profilestores/index.html" />
<item name="Bytecode" href="../bytecode/index.html" />
+ <item name="Monitoring" href="../monitoring/index.html" />
<item name="Webapp Support" href="../webapp/index.html" />
<item name="Webserver" href="../webserver/index.html" />
<item name="Remoting" href="../remoting/index.html" />
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/AuthenticatorAbstractForDfltRuntimeTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/AuthenticatorAbstractForDfltRuntimeTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/AuthenticatorAbstractForDfltRuntimeTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/AuthenticatorAbstractForDfltRuntimeTest.java Thu Apr 28 23:05:40 2011
@@ -35,8 +35,9 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.MultiUserExplorationSession;
+import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticatorAbstractForDfltRuntime;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.AuthenticationRequestExploration;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.MultiUserExplorationSession;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import static org.junit.Assert.assertThat;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/MultiUserExplorationSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/MultiUserExplorationSessionTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/MultiUserExplorationSessionTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/MultiUserExplorationSessionTest.java Thu Apr 28 23:05:40 2011
@@ -40,11 +40,11 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.ExplorationAuthenticator;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.ExplorationAuthenticatorConstants;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.ExplorationSession;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.MultiUserExplorationSession;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.AuthenticationRequestExploration;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.ExplorationAuthenticator;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.ExplorationAuthenticatorConstants;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.ExplorationSession;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.MultiUserExplorationSession;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java Thu Apr 28 23:05:40 2011
@@ -33,9 +33,9 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.ExplorationAuthenticator;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.ExplorationAuthenticatorConstants;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.AuthenticationRequestExploration;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.ExplorationAuthenticator;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.ExplorationAuthenticatorConstants;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;