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 [2/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/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugList.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/DebugList.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugList.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugList.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/context/DebugList.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/DebugList.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugList.java Thu Apr 28 23:05:40 2011
@@ -18,23 +18,20 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.context;
+package org.apache.isis.core.commons.debug;
import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.core.commons.debug.DebuggableWithTitle;
public class DebugList {
- private final List<DebuggableWithTitle> l = Lists.newArrayList();
- private final DebugString summary = new DebugString();
+ private final List<DebuggableWithTitle> debuggableList = Lists.newArrayList();
+ private final DebugBuilder summary = new DebugString();
public DebugList(final String name) {
- l.add(new DebuggableWithTitle() {
+ debuggableList.add(new DebuggableWithTitle() {
@Override
public void debugData(DebugBuilder debug) {
debug.append(summary.toString());
@@ -50,7 +47,7 @@ public class DebugList {
public void add(String name, Object object) {
boolean b = object instanceof DebuggableWithTitle;
if (b) {
- l.add((DebuggableWithTitle) object);
+ debuggableList.add((DebuggableWithTitle) object);
}
if (object != null) {
summary.appendln(name + (b ? "*" : ""), object.toString());
@@ -58,7 +55,7 @@ public class DebugList {
}
public DebuggableWithTitle[] debug() {
- return l.toArray(new DebuggableWithTitle[l.size()]);
+ return debuggableList.toArray(new DebuggableWithTitle[debuggableList.size()]);
}
}
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterFactory.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/AdapterFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterFactory.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/AdapterFactory.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/adapterfactory/AdapterFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterFactory.java Thu Apr 28 23:05:40 2011
@@ -18,11 +18,10 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory;
+package org.apache.isis.core.metamodel.adapter;
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -33,7 +32,7 @@ import org.apache.isis.core.metamodel.ad
* Introduced to allow subclasses of ObjectAdapter with support for {@link OneToOneAssociationInstance}
* and so on.
*/
-public interface AdapterFactory extends SessionScopedComponent, Injectable {
+public interface ObjectAdapterFactory extends SessionScopedComponent, Injectable {
public ObjectAdapter createAdapter(final Object pojo, final Oid oid);
}
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterLookup.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerLookup.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterLookup.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterLookup.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerLookup.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/AdapterManagerLookup.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterLookup.java Thu Apr 28 23:05:40 2011
@@ -18,10 +18,9 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager;
+package org.apache.isis.core.metamodel.adapter;
import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -37,7 +36,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 AdapterManagerLookup extends Injectable {
+public interface ObjectAdapterLookup extends Injectable {
/**
Modified: incubator/isis/trunk/core/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/pom.xml?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/pom.xml (original)
+++ incubator/isis/trunk/core/runtime/pom.xml Thu Apr 28 23:05:40 2011
@@ -55,6 +55,10 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
<dependency>
<groupId>javax.mail</groupId>
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/BootPrinter.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/BootPrinter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/BootPrinter.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/BootPrinter.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/BootPrinter.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/BootPrinter.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/BootPrinter.java Thu Apr 28 23:05:40 2011
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.runner;
+package org.apache.isis.core.runtime.optionhandler;
import java.io.PrintStream;
import java.io.PrintWriter;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
-import org.apache.isis.runtimes.dflt.runtime.system.internal.monitor.SystemPrinter;
+import org.apache.isis.core.runtime.sysout.SystemPrinter;
public class BootPrinter extends SystemPrinter {
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionHandler.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionHandler.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionHandler.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java Thu Apr 28 23:05:40 2011
@@ -18,13 +18,12 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.runner.options;
+package org.apache.isis.core.runtime.optionhandler;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
public interface OptionHandler extends IsisConfigurationBuilderPrimer {
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionHandlerAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionHandlerAbstract.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionHandlerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.runner.options;
+package org.apache.isis.core.runtime.optionhandler;
import java.util.ArrayList;
import java.util.List;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/profiler/Profiler.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/profiler/Profiler.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/profiler/Profiler.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/profiler/Profiler.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/profiler/Profiler.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/profiler/Profiler.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/profiler/Profiler.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.profiler;
+package org.apache.isis.core.runtime.profiler;
import java.text.NumberFormat;
import java.util.Hashtable;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/profiler/ProfilerSystem.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/profiler/ProfilerSystem.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/profiler/ProfilerSystem.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/profiler/ProfilerSystem.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/profiler/ProfilerSystem.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/profiler/ProfilerSystem.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/profiler/ProfilerSystem.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.profiler;
+package org.apache.isis.core.runtime.profiler;
public class ProfilerSystem {
protected long memory() {
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/internal/monitor/SystemPrinter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/internal/monitor/SystemPrinter.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/internal/monitor/SystemPrinter.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java Thu Apr 28 23:05:40 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.system.internal.monitor;
+package org.apache.isis.core.runtime.sysout;
import java.io.File;
import java.io.FileReader;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/Options.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/Options.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/Options.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/Options.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/Options.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/Options.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/Options.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.userprofile;
+package org.apache.isis.core.runtime.userprofile;
import java.util.Enumeration;
import java.util.Iterator;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/OptionsAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/OptionsAware.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/OptionsAware.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java Thu Apr 28 23:05:40 2011
@@ -18,10 +18,10 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.userprofile;
+package org.apache.isis.core.runtime.userprofile;
-public interface OptionsAware {
+public interface OptionsClient {
void loadOptions(Options viewOptions);
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/PerspectiveEntry.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/PerspectiveEntry.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/PerspectiveEntry.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java Thu Apr 28 23:05:40 2011
@@ -18,22 +18,15 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.userprofile;
+package org.apache.isis.core.runtime.userprofile;
import java.util.List;
-import org.apache.isis.core.commons.debug.DebugBuilder;
-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.core.metamodel.adapter.map.AdapterMap;
-import org.apache.isis.core.metamodel.services.ServiceUtil;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
import com.google.common.collect.Lists;
-public class PerspectiveEntry implements DebuggableWithTitle {
+public class PerspectiveEntry {
private final List<Object> objects = Lists.newArrayList();
private final List<Object> services = Lists.newArrayList();
@@ -92,49 +85,19 @@ public class PerspectiveEntry implements
return services;
}
- public Object addToServices(Class<?> serviceType) {
- Object service = findService(serviceType);
- addToServices(service);
- return service;
- }
-
public void addToServices(Object service) {
if (service != null && !services.contains(service)) {
services.add(service);
}
}
- public void removeFromServices(Class<?> serviceType) {
- Object service = findService(serviceType);
- if (!services.contains(service)) {
+ public void removeFromServices(Object service) {
+ if (service != null && services.contains(service)) {
services.remove(service);
}
}
- public void removeFromServices(Object service) {
- services.remove(service);
- }
-
- private Object findService(Class<?> serviceType) {
- for (Object service : IsisContext.getServices()) {
- if (service.getClass().isAssignableFrom(serviceType)) {
- return service;
- }
- }
- throw new IsisException("No service of type " + serviceType.getName());
- }
-
- /////////////////////////////////////////////////////////
- // Generic Repository
- /////////////////////////////////////////////////////////
-
- public void addGenericRepository(Class<?> type) {
- Object service = getPersistenceSession().getService("repository#" + type.getName()).getObject();
- addToServices(service);
- }
-
-
/////////////////////////////////////////////////////////
// copy
/////////////////////////////////////////////////////////
@@ -149,126 +112,8 @@ public class PerspectiveEntry implements
}
}
-
- /////////////////////////////////////////////////////////
- // Debugging
- /////////////////////////////////////////////////////////
-
- @Override
- public void debugData(DebugBuilder debug) {
- debug.appendln("Name", getName());
- debug.blankLine();
- debug.appendTitle("Services (Ids)");
- debug.indent();
- for (Object service : getServices()) {
- debug.appendln(ServiceUtil.id(service));
- }
- debug.unindent();
-
- debug.blankLine();
- debug.appendTitle("Objects");
- debug.indent();
- AdapterMap adapterMap = getAdapterMap();
- for (Object obj : getObjects()) {
- debug.appendln(adapterMap.adapterFor(obj).toString());
- }
- debug.unindent();
- }
-
- @Override
- public String debugTitle() {
- return "Perspective";
- }
- /////////////////////////////////////////////////////////
- // Dependencies (from Context)
- /////////////////////////////////////////////////////////
-
- private AdapterMap getAdapterMap() {
- return getPersistenceSession().getAdapterManager();
- }
-
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
- }
-
-
-
- /////////////////////////////////////////////////////////
- // REVIEW: what's this commented out code???
- /////////////////////////////////////////////////////////
-
- /*
- public PerspectiveEntry(XElement doc) {
- name = doc.Element("name").Value;
-
- XElement servicesElement = doc.Element("services");
- foreach (XElement serviceElement in servicesElement.Elements()) {
- XAttribute id = serviceElement.Attribute("id");
- IObjectAdapter s = IsisContext.ObjectPersistor.GetService(id.Value);
- if (s != null) {
- services.Add(s.Object);
- }
- Console.WriteLine(id + " " + s);
- }
-
- XElement objectsElement = doc.Element("objects");
- foreach (XElement objectElement in objectsElement.Elements()) {
- IObjectSpecification specification =
- IsisContext.Reflector.LoadSpecification(
- objectElement.Attribute("specification").Value);
-
- List<String> data = new List<string>();
- foreach (XElement dataElement in objectElement.Elements("data")) {
- data.Add(dataElement.Value);
- }
- string[] dataArray = data.ToArray();
-
- Type oidType = TypeUtils.GetType(objectElement.Attribute("oid").Value);
- ConstructorInfo contructor = oidType.GetConstructor(new Type[] { typeof(String[]) });
- IOid oid = (IOid)contructor.Invoke(new object[] { dataArray });
-
-
- IObjectAdapter s = IsisContext.ObjectPersistor.LoadObject(oid, specification);
- if (s != null) {
- objects.Add(s.Object);
- }
- Console.WriteLine(oid + " " + s);
-
- }
- }
-
-
- public void SaveAsXml(XElement element) {
- element.Add(new XElement("name", name));
-
- XElement servicesElement = new XElement("services");
- foreach (object service in Services) {
- XElement serviceElement = new XElement("service");
- serviceElement.Add(new XAttribute("id", ServiceUtils.GetId(service)));
- servicesElement.Add(serviceElement);
- }
- element.Add(servicesElement);
-
- XElement objectsElement = new XElement("objects");
- foreach (object pojo in Objects) {
- IObjectAdapter obj = IsisContext.ObjectPersistor.GetAdapterFor(pojo);
- if (obj.Oid is IEncodedToStrings) {
- XElement objectElement = new XElement("object");
- objectElement.Add(new XAttribute("specification", obj.Specification.FullName));
- objectElement.Add(new XAttribute("oid", obj.Oid.GetType().FullName));
- string[] oidData = ((IEncodedToStrings)obj.Oid).ToEncodedStrings();
- foreach (string data in oidData) {
- objectElement.Add(new XElement("data", data));
- }
- objectsElement.Add(objectElement);
- }
- }
- element.Add(objectsElement);
- }
-*/
-
}
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserLocalization.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserLocalization.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserLocalization.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java Thu Apr 28 23:05:40 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.userprofile;
+package org.apache.isis.core.runtime.userprofile;
import java.util.Locale;
import java.util.TimeZone;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfile.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfile.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfile.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java Thu Apr 28 23:05:40 2011
@@ -18,8 +18,9 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.userprofile;
+package org.apache.isis.core.runtime.userprofile;
+import java.util.Collections;
import java.util.List;
import org.apache.isis.applib.adapters.Localization;
@@ -30,7 +31,7 @@ import org.apache.isis.core.metamodel.ad
import com.google.common.collect.Lists;
-public class UserProfile implements DebuggableWithTitle {
+public class UserProfile /* implements DebuggableWithTitle */ {
public UserProfile() {}
@@ -115,7 +116,16 @@ public class UserProfile implements Debu
}
options.copy(template.getOptions());
}
+
+ /**
+ * Introduced for debugging.
+ */
+ public List<PerspectiveEntry> getEntries() {
+ return Collections.unmodifiableList(entries);
+ }
+
+
/////////////////////////////////////////////////////////
// Options
/////////////////////////////////////////////////////////
@@ -154,24 +164,6 @@ public class UserProfile implements Debu
entry.save(objects);
}
- /////////////////////////////////
- // Debug
- /////////////////////////////////
-
- public void debugData(DebugBuilder debug) {
- debug.appendTitle("Options");
- debug.indent();
- debug.append(options);
- debug.unindent();
- debug.appendTitle("Perspectives");
- for (PerspectiveEntry entry : entries) {
- entry.debugData(debug);
- }
- }
-
- public String debugTitle() {
- return toString();
- }
}
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoader.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoader.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/UserProfileLoader.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java Thu Apr 28 23:05:40 2011
@@ -18,17 +18,16 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.userprofile;
+package org.apache.isis.core.runtime.userprofile;
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.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
/**
- * Acts like a bridge, loading the profile from the underlying store.
+ * Intended to acts like a bridge, loading the profile from the underlying store.
*
* <p>
* This is an interface only to make it easy to mock in tests. In practice
@@ -55,6 +54,7 @@ public interface UserProfileLoader exten
public void saveForUser(String userName, UserProfile userProfile);
+
////////////////////////////////////////////////////////
// saveSession
////////////////////////////////////////////////////////
@@ -68,6 +68,7 @@ public interface UserProfileLoader exten
public UserProfile getProfile(AuthenticationSession session);
+
@Deprecated
public UserProfile getProfile();
@@ -77,7 +78,9 @@ public interface UserProfileLoader exten
////////////////////////////////////////////////////////
public void setServices(List<Object> servicesList);
- List<Object> getServices();
+
+
+ public List<Object> getServices();
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileStore.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileStore.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileStore.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,8 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.userprofile;
+package org.apache.isis.core.runtime.userprofile;
+
public interface UserProfileStore {
Modified: incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml (original)
+++ incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml Thu Apr 28 23:05:40 2011
@@ -2555,6 +2555,31 @@ Element customerAsXml = snapshot.toXml()
</sect1>
<sect1>
+ <title>Command Line Flag (<classname>OptionHandler</classname>)
+ API</title>
+
+ <para>*** to document.</para>
+
+ <para></para>
+ </sect1>
+
+ <sect1>
+ <title>Sysout (SystemPrinter) Utility</title>
+
+ <para>*** to document.</para>
+
+ <para></para>
+ </sect1>
+
+ <sect1>
+ <title>Profiler Utility</title>
+
+ <para>*** to document.</para>
+
+ <para></para>
+ </sect1>
+
+ <sect1>
<title>Logging Support</title>
<sect2>
Modified: incubator/isis/trunk/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java (original)
+++ incubator/isis/trunk/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java Thu Apr 28 23:05:40 2011
@@ -48,8 +48,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-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;
public class JavaReflectorInstaller extends InstallerAbstract implements ObjectReflectorInstaller, InstallerLookupAware {
Modified: incubator/isis/trunk/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/JavaReflectorTestAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/JavaReflectorTestAbstract.java Thu Apr 28 23:05:40 2011
@@ -51,14 +51,14 @@ import org.apache.isis.core.progmodel.me
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.IsisContextStatic;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.runtimes.dflt.runtime.persistence.internal.RuntimeContextFromSession;
-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.system.DeploymentType;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContextStatic;
+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.testsystem.TestClassSubstitutor;
-import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileLoader;
@RunWith(JMock.class)
public abstract class JavaReflectorTestAbstract {
Modified: incubator/isis/trunk/release/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/release/pom.xml?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/release/pom.xml (original)
+++ incubator/isis/trunk/release/pom.xml Thu Apr 28 23:05:40 2011
@@ -180,6 +180,11 @@
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
+ <artifactId>monitoring</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>webapp</artifactId>
<version>${isis.version}</version>
</dependency>
Modified: incubator/isis/trunk/runtimes/dflt/bytecode/javassist/src/main/java/org/apache/isis/runtimes/dflt/bytecode/javassist/objectfactory/JavassistObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/bytecode/javassist/src/main/java/org/apache/isis/runtimes/dflt/bytecode/javassist/objectfactory/JavassistObjectFactory.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/bytecode/javassist/src/main/java/org/apache/isis/runtimes/dflt/bytecode/javassist/objectfactory/JavassistObjectFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/bytecode/javassist/src/main/java/org/apache/isis/runtimes/dflt/bytecode/javassist/objectfactory/JavassistObjectFactory.java Thu Apr 28 23:05:40 2011
@@ -22,13 +22,13 @@ package org.apache.isis.runtimes.dflt.by
import org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.internal.ObjectResolveAndObjectChangedEnhancer;
import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionAware;
import org.apache.isis.runtimes.dflt.runtime.persistence.container.DomainObjectContainerObjectChanged;
import org.apache.isis.runtimes.dflt.runtime.persistence.container.DomainObjectContainerResolve;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectChanger;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectFactoryAbstract;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectResolver;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
public class JavassistObjectFactory extends ObjectFactoryAbstract {
Modified: incubator/isis/trunk/runtimes/dflt/bytecode/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/bytecode/src/site/site.xml?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/bytecode/src/site/site.xml (original)
+++ incubator/isis/trunk/runtimes/dflt/bytecode/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" />
Added: incubator/isis/trunk/runtimes/dflt/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/monitoring/pom.xml?rev=1097654&view=auto
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/monitoring/pom.xml (added)
+++ incubator/isis/trunk/runtimes/dflt/monitoring/pom.xml Thu Apr 28 23:05:40 2011
@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.runtimes</groupId>
+ <artifactId>dflt</artifactId>
+ <version>0.1.2-incubating-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <artifactId>monitoring</artifactId>
+ <name>Default Runtime Monitoring</name>
+
+ <properties>
+ <siteBaseDir>../../..</siteBaseDir>
+ <relativeUrl>runtimes/dflt/monitoring/</relativeUrl>
+ </properties>
+
+ <url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${maven-project-info-reports-plugin}</version>
+ <inherited>false</inherited>
+ <configuration>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <inherited>false</inherited>
+ <reports>
+ <report>dependencies</report>
+ <report>dependency-convergence</report>
+ <report>plugins</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <artifactId>runtime</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore.java Thu Apr 28 23:05:40 2011
@@ -38,21 +38,21 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.persistence.ObjectNotFoundException;
-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.persistence.PersistenceSessionHydrator;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistorUtil;
import org.apache.isis.runtimes.dflt.runtime.persistence.UnsupportedFindException;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStore;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.SaveObjectCommand;
-import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQuery;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryBuiltIn;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionHydrator;
import org.apache.isis.runtimes.dflt.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtimes.dflt.objectstores.dflt.internal.ObjectStoreInstances;
import org.apache.isis.runtimes.dflt.objectstores.dflt.internal.ObjectStorePersistedObjects;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryPersistenceMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryPersistenceMechanismInstaller.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryPersistenceMechanismInstaller.java Thu Apr 28 23:05:40 2011
@@ -21,12 +21,12 @@
package org.apache.isis.runtimes.dflt.objectstores.dflt;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.ObjectStorePersistenceMechanismInstallerAbstract;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStore;
-import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
/**
@@ -59,7 +59,7 @@ public class InMemoryPersistenceMechanis
*/
protected ObjectStore createObjectStore(
final IsisConfiguration configuration,
- final AdapterFactory adapterFactory,
+ final ObjectAdapterFactory adapterFactory,
final AdapterManager adapterManager) {
return new InMemoryObjectStore();
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryPersistenceSessionFactory.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryPersistenceSessionFactory.java Thu Apr 28 23:05:40 2011
@@ -20,12 +20,12 @@
package org.apache.isis.runtimes.dflt.objectstores.dflt;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactoryDelegate;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactoryDelegating;
-import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.OidGenerator;
import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.objectstores.dflt.internal.ObjectStoreInstances;
import org.apache.isis.runtimes.dflt.objectstores.dflt.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtimes.dflt.objectstores.dflt.internal.ObjectStorePersistedObjectsDefault;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/internal/ObjectStoreInstances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/internal/ObjectStoreInstances.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/internal/ObjectStoreInstances.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/internal/ObjectStoreInstances.java Thu Apr 28 23:05:40 2011
@@ -37,12 +37,12 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
import org.apache.isis.core.metamodel.adapter.version.Version;
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.persistence.PersistenceSessionHydrator;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryBuiltIn;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByTitle;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionHydrator;
import org.apache.isis.runtimes.dflt.objectstores.dflt.InMemoryObjectStore;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/AbstractInMemoryObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/AbstractInMemoryObjectStoreTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/AbstractInMemoryObjectStoreTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/AbstractInMemoryObjectStoreTest.java Thu Apr 28 23:05:40 2011
@@ -23,8 +23,8 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.Collections;
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.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.testsystem.ProxyJunit3TestCase;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore_openAndClose.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore_openAndClose.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore_openAndClose.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore_openAndClose.java Thu Apr 28 23:05:40 2011
@@ -23,7 +23,7 @@ package org.apache.isis.runtimes.dflt.ob
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.objectstores.dflt.internal.ObjectStorePersistedObjects;
import org.jmock.Expectations;
import org.jmock.Mockery;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/fixture/ObjectFixtureFilePersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/fixture/ObjectFixtureFilePersistorTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/fixture/ObjectFixtureFilePersistorTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/fixture/ObjectFixtureFilePersistorTest.java Thu Apr 28 23:05:40 2011
@@ -35,8 +35,8 @@ import java.util.Set;
import junit.framework.Assert;
-import org.apache.isis.runtimes.dflt.runtime.fixture.ObjectFixtureFilePersistor;
-import org.apache.isis.runtimes.dflt.runtime.fixturesinstaller.FixtureException;
+import org.apache.isis.runtimes.dflt.runtime.fixturedomainservice.FixtureException;
+import org.apache.isis.runtimes.dflt.runtime.fixturedomainservice.ObjectFixtureFilePersistor;
import org.apache.isis.core.testsupport.testdomain.Movie;
import org.apache.isis.core.testsupport.testdomain.Person;
import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/fixture/ObjectFixtureServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/fixture/ObjectFixtureServiceTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/fixture/ObjectFixtureServiceTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/fixture/ObjectFixtureServiceTest.java Thu Apr 28 23:05:40 2011
@@ -30,7 +30,7 @@ import java.util.Set;
import junit.framework.Assert;
import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.runtimes.dflt.runtime.fixture.ObjectFixtureService;
+import org.apache.isis.runtimes.dflt.runtime.fixturedomainservice.ObjectFixtureService;
import org.apache.isis.core.testsupport.testdomain.Movie;
import org.apache.isis.core.testsupport.testdomain.Person;
import org.apache.isis.core.testsupport.testdomain.Role;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/testsystem/TestProxySystemII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/testsystem/TestProxySystemII.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/testsystem/TestProxySystemII.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/testsystem/TestProxySystemII.java Thu Apr 28 23:05:40 2011
@@ -35,14 +35,14 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.progmodels.dflt.JavaReflectorInstaller;
-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.persistence.PersistenceSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.persistence.internal.RuntimeContextFromSession;
-import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactoryDefault;
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.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContextStatic;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactoryDefault;
import org.apache.isis.runtimes.dflt.objectstores.dflt.InMemoryPersistenceMechanismInstaller;
/*
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStore.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStore.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStore.java Thu Apr 28 23:05:40 2011
@@ -32,17 +32,17 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-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.adaptermanager.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStore;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.SaveObjectCommand;
-import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQuery;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryBuiltIn;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
public class NoSqlObjectStore implements ObjectStore {
private final NoSqlDataDatabase database;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlPersistorMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlPersistorMechanismInstaller.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlPersistorMechanismInstaller.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlPersistorMechanismInstaller.java Thu Apr 28 23:05:40 2011
@@ -21,14 +21,14 @@
package org.apache.isis.runtimes.dflt.objectstores.nosql;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.ObjectStorePersistenceMechanismInstallerAbstract;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactoryDelegating;
-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.objectstore.ObjectStore;
-import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
-import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.OidGenerator;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
public abstract class NoSqlPersistorMechanismInstaller extends ObjectStorePersistenceMechanismInstallerAbstract {
@@ -40,7 +40,7 @@ public abstract class NoSqlPersistorMech
}
@Override
- protected ObjectStore createObjectStore(IsisConfiguration configuration, AdapterFactory objectFactory, AdapterManager adapterManager) {
+ protected ObjectStore createObjectStore(IsisConfiguration configuration, ObjectAdapterFactory objectFactory, AdapterManager adapterManager) {
return getObjectStore(configuration);
}
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java Thu Apr 28 23:05:40 2011
@@ -35,8 +35,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationContainer;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
class ObjectReader {
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SerialKeyCreator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SerialKeyCreator.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SerialKeyCreator.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SerialKeyCreator.java Thu Apr 28 23:05:40 2011
@@ -23,8 +23,8 @@ package org.apache.isis.runtimes.dflt.ob
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
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.oidgenerator.simple.SerialOid;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
public class SerialKeyCreator implements KeyCreator {
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/WriteObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/WriteObjectCommand.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/WriteObjectCommand.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/WriteObjectCommand.java Thu Apr 28 23:05:40 2011
@@ -31,9 +31,9 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.DomainModelException;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
class WriteObjectCommand implements PersistenceCommand {
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/DestroyObjectCommandImplementationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/DestroyObjectCommandImplementationTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/DestroyObjectCommandImplementationTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/DestroyObjectCommandImplementationTest.java Thu Apr 28 23:05:40 2011
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
public class DestroyObjectCommandImplementationTest {
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStoreTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStoreTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStoreTest.java Thu Apr 28 23:05:40 2011
@@ -37,11 +37,11 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
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.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
-import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
import static org.junit.Assert.assertEquals;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReaderTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReaderTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReaderTest.java Thu Apr 28 23:05:40 2011
@@ -25,8 +25,8 @@ import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
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.oidgenerator.simple.SerialOid;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SerialKeyCreatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SerialKeyCreatorTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SerialKeyCreatorTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SerialKeyCreatorTest.java Thu Apr 28 23:05:40 2011
@@ -28,8 +28,8 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
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.oidgenerator.simple.SerialOid;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
import static org.junit.Assert.assertEquals;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SystemTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SystemTest.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SystemTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/SystemTest.java Thu Apr 28 23:05:40 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebugString;
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.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/TrialObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/TrialObjects.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/TrialObjects.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/TrialObjects.java Thu Apr 28 23:05:40 2011
@@ -26,6 +26,7 @@ import com.google.common.collect.Maps;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
import org.apache.isis.core.metamodel.adapter.map.AdapterMapAbstract;
@@ -40,7 +41,6 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.progmodel.layout.dflt.MemberLayoutArrangerDefault;
import org.apache.isis.core.progmodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.AdapterFactory;
import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.AdapterFactoryAbstract;
import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestClassSubstitutor;
@@ -48,7 +48,7 @@ import org.apache.isis.runtimes.dflt.run
public class TrialObjects {
- private AdapterFactory factory;
+ private ObjectAdapterFactory factory;
private ObjectReflectorDefault reflector;
private final Map<Object, ObjectAdapter> adapters = Maps.newHashMap();
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/FieldMappingLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/FieldMappingLookup.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/FieldMappingLookup.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/FieldMappingLookup.java Thu Apr 28 23:05:40 2011
@@ -33,7 +33,7 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.ObjectReferenceMapping;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.ObjectReferenceMappingFactory;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
public class FieldMappingLookup {
private static final Logger LOG = Logger.getLogger(FieldMappingLookup.class);
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/IdMappingAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/IdMappingAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/IdMappingAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/IdMappingAbstract.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.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.objectstores.sql.SqlOid.State;
import org.apache.isis.runtimes.dflt.objectstores.sql.jdbc.JdbcConnector;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
public class IdMappingAbstract {
private String column;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/ObjectMappingLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/ObjectMappingLookup.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/ObjectMappingLookup.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/ObjectMappingLookup.java Thu Apr 28 23:05:40 2011
@@ -33,7 +33,7 @@ import org.apache.isis.core.commons.fact
import org.apache.isis.core.commons.factory.InstanceUtil;
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.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.transaction.ObjectPersistenceException;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlExecutionContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlExecutionContext.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlExecutionContext.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlExecutionContext.java Thu Apr 28 23:05:40 2011
@@ -21,9 +21,9 @@
package org.apache.isis.runtimes.dflt.objectstores.sql;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
-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.system.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java Thu Apr 28 23:05:40 2011
@@ -32,20 +32,20 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStore;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.SaveObjectCommand;
-import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQuery;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByPattern;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByTitle;
-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.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
+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 final class SqlObjectStore implements ObjectStore {
private static final String TABLE_NAME = "isis_admin_services";