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 2010/10/27 19:00:32 UTC
svn commit: r1028037 [3/13] - in /incubator/isis/trunk: alternatives/
alternatives/embedded/ alternatives/embedded/src/docbkx/
alternatives/embedded/src/docbkx/guide/
alternatives/embedded/src/docbkx/guide/images/
alternatives/embedded/src/main/java/or...
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/CollectionInvocationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/CollectionInvocationHandler.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/CollectionInvocationHandler.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import static org.apache.isis.commons.lang.MethodUtils.getMethod;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandler.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/DelegatingInvocationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandler.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandler.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/DelegatingInvocationHandler.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/DelegatingInvocationHandler.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandler.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import java.lang.reflect.InvocationHandler;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/DelegatingInvocationHandlerDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/DelegatingInvocationHandlerDefault.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/DelegatingInvocationHandlerDefault.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -28,8 +28,8 @@ import org.apache.isis.metamodel.adapter
import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.extensions.headless.applib.HeadlessViewer;
-import org.apache.isis.extensions.headless.applib.HeadlessViewer.ExecutionMode;
+import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
+import org.apache.isis.progmodel.wrapper.applib.WrapperFactory.ExecutionMode;
import org.apache.isis.runtime.persistence.container.DomainObjectContainerObjectChanged;
import org.apache.isis.runtime.persistence.container.DomainObjectContainerResolve;
@@ -38,7 +38,7 @@ import org.apache.isis.runtime.persisten
public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocationHandler<T> {
private final T delegate;
- protected final HeadlessViewer headlessViewer;
+ protected final WrapperFactory headlessViewer;
private final ExecutionMode executionMode;
private final RuntimeContext runtimeContext;
@@ -53,7 +53,7 @@ public class DelegatingInvocationHandler
public DelegatingInvocationHandlerDefault(
final T delegate,
- final HeadlessViewer headlessViewer,
+ final WrapperFactory headlessViewer,
final ExecutionMode executionMode,
final RuntimeContext runtimeContext) {
if (delegate == null) {
@@ -106,7 +106,7 @@ public class DelegatingInvocationHandler
- public HeadlessViewer getHeadlessViewer() {
+ public WrapperFactory getHeadlessViewer() {
return headlessViewer;
}
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/DomainObjectInvocationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/DomainObjectInvocationHandler.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/DomainObjectInvocationHandler.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -47,15 +47,15 @@ import org.apache.isis.metamodel.spec.fe
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.util.IsisUtils;
-import org.apache.isis.extensions.headless.applib.DisabledException;
-import org.apache.isis.extensions.headless.applib.HeadlessViewer;
-import org.apache.isis.extensions.headless.applib.HiddenException;
-import org.apache.isis.extensions.headless.applib.InteractionException;
-import org.apache.isis.extensions.headless.applib.InvalidException;
-import org.apache.isis.extensions.headless.applib.ViewObject;
-import org.apache.isis.extensions.headless.applib.HeadlessViewer.ExecutionMode;
-import org.apache.isis.extensions.headless.viewer.internal.util.Constants;
-import org.apache.isis.extensions.headless.viewer.internal.util.MethodPrefixFinder;
+import org.apache.isis.progmodel.wrapper.applib.DisabledException;
+import org.apache.isis.progmodel.wrapper.applib.HiddenException;
+import org.apache.isis.progmodel.wrapper.applib.InteractionException;
+import org.apache.isis.progmodel.wrapper.applib.InvalidException;
+import org.apache.isis.progmodel.wrapper.applib.WrappedObject;
+import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
+import org.apache.isis.progmodel.wrapper.applib.WrapperFactory.ExecutionMode;
+import org.apache.isis.progmodel.wrapper.metamodel.internal.util.Constants;
+import org.apache.isis.progmodel.wrapper.metamodel.internal.util.MethodPrefixFinder;
public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandlerDefault<T> {
@@ -66,12 +66,12 @@ public class DomainObjectInvocationHandl
protected Method titleMethod;
/**
- * The <tt>save()</tt> method from {@link ViewObject#save()}.
+ * The <tt>save()</tt> method from {@link WrappedObject#save()}.
*/
protected Method saveMethod;
/**
- * The <tt>underlying()</tt> method from {@link ViewObject#underlying()}.
+ * The <tt>underlying()</tt> method from {@link WrappedObject#underlying()}.
*/
protected Method underlyingMethod;
@@ -80,14 +80,14 @@ public class DomainObjectInvocationHandl
public DomainObjectInvocationHandler(
final T delegate,
- final HeadlessViewer embeddedViewer,
+ final WrapperFactory embeddedViewer,
final ExecutionMode mode,
final RuntimeContext runtimeContext) {
super(delegate, embeddedViewer, mode, runtimeContext);
try {
titleMethod = delegate.getClass().getMethod("title", new Class[] {});
- saveMethod = ViewObject.class.getMethod("save", new Class[] {});
- underlyingMethod = ViewObject.class.getMethod("underlying", new Class[] {});
+ saveMethod = WrappedObject.class.getMethod("save", new Class[] {});
+ underlyingMethod = WrappedObject.class.getMethod("underlying", new Class[] {});
} catch (final NoSuchMethodException e) {}
}
@@ -325,7 +325,7 @@ public class DomainObjectInvocationHandl
final OneToManyAssociation otma) {
Collection<?> collectionViewObject = collectionViewObjectsByMethod.get(method);
if (collectionViewObject == null) {
- if (collectionToLookup instanceof ViewObject) {
+ if (collectionToLookup instanceof WrappedObject) {
collectionViewObject = collectionToLookup;
} else {
collectionViewObject = Proxy.proxy(collectionToLookup, memberName, this, getRuntimeContext(), otma);
@@ -342,7 +342,7 @@ public class DomainObjectInvocationHandl
final OneToManyAssociation otma) {
Map<?, ?> mapViewObject = mapViewObjectsByMethod.get(method);
if (mapViewObject == null) {
- if (mapToLookup instanceof ViewObject) {
+ if (mapToLookup instanceof WrappedObject) {
mapViewObject = mapToLookup;
} else {
mapViewObject = Proxy.proxy(mapToLookup, memberName, this, getRuntimeContext(), otma);
@@ -456,8 +456,8 @@ public class DomainObjectInvocationHandl
}
private Object underlying(final Object arg) {
- if (arg instanceof ViewObject<?>) {
- final ViewObject<?> argViewObject = (ViewObject<?>) arg;
+ if (arg instanceof WrappedObject<?>) {
+ final WrappedObject<?> argViewObject = (WrappedObject<?>) arg;
return argViewObject.underlying();
} else {
return arg;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/IClassInstantiatorCE.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/IClassInstantiatorCE.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/IClassInstantiatorCE.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/IClassInstantiatorCE.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/IClassInstantiatorCE.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/IClassInstantiatorCE.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/IClassInstantiatorCE.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
/**
* Used to instantiate a given class.
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/IProxyFactory.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/IProxyFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/IProxyFactory.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/IProxyFactory.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/IProxyFactory.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/IProxyFactory.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/IProxyFactory.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import java.lang.reflect.InvocationHandler;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InteractionEventDispatcher.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/InteractionEventDispatcher.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InteractionEventDispatcher.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InteractionEventDispatcher.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/InteractionEventDispatcher.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/InteractionEventDispatcher.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InteractionEventDispatcher.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import org.apache.isis.applib.events.InteractionEvent;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InteractionEventDispatcherTypeSafe.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/InteractionEventDispatcherTypeSafe.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InteractionEventDispatcherTypeSafe.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InteractionEventDispatcherTypeSafe.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/InteractionEventDispatcherTypeSafe.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/InteractionEventDispatcherTypeSafe.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InteractionEventDispatcherTypeSafe.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import org.apache.isis.applib.events.InteractionEvent;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InvocationHandlerMethodInterceptor.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/InvocationHandlerMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InvocationHandlerMethodInterceptor.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InvocationHandlerMethodInterceptor.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/InvocationHandlerMethodInterceptor.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/InvocationHandlerMethodInterceptor.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InvocationHandlerMethodInterceptor.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/JavaProxyFactory.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/JavaProxyFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/JavaProxyFactory.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/JavaProxyFactory.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/JavaProxyFactory.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/JavaProxyFactory.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/JavaProxyFactory.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
-import org.apache.isis.extensions.headless.applib.ViewObject;
+import org.apache.isis.progmodel.wrapper.applib.WrappedObject;
@@ -36,6 +36,6 @@ public class JavaProxyFactory<T> impleme
@SuppressWarnings("unchecked")
public T createProxy(final Class<T> toProxy, final InvocationHandler handler) {
- return (T) Proxy.newProxyInstance(toProxy.getClassLoader(), new Class[] { toProxy, ViewObject.class }, handler);
+ return (T) Proxy.newProxyInstance(toProxy.getClassLoader(), new Class[] { toProxy, WrappedObject.class }, handler);
}
}
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/MapInvocationHandler.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/MapInvocationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/MapInvocationHandler.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/MapInvocationHandler.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/MapInvocationHandler.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/MapInvocationHandler.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/MapInvocationHandler.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import static org.apache.isis.commons.lang.MethodUtils.getMethod;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/ObjenesisClassInstantiatorCE.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/ObjenesisClassInstantiatorCE.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/ObjenesisClassInstantiatorCE.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/ObjenesisClassInstantiatorCE.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/ObjenesisClassInstantiatorCE.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/ObjenesisClassInstantiatorCE.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/ObjenesisClassInstantiatorCE.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import org.objenesis.ObjenesisHelper;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/Proxy.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/Proxy.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/Proxy.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java Wed Oct 27 17:00:06 2010
@@ -18,22 +18,22 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import java.util.Collection;
import java.util.Map;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.extensions.headless.applib.HeadlessViewer;
-import org.apache.isis.extensions.headless.applib.HeadlessViewer.ExecutionMode;
+import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
+import org.apache.isis.progmodel.wrapper.applib.WrapperFactory.ExecutionMode;
public class Proxy {
public static <T> T proxy(
final T toProxy,
- final HeadlessViewer embeddedViewer,
+ final WrapperFactory embeddedViewer,
final ExecutionMode mode,
final RuntimeContext runtimeContext) {
final DomainObjectInvocationHandler<T> invocationHandler =
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/RuntimeExceptionWrapper.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/RuntimeExceptionWrapper.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/RuntimeExceptionWrapper.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/RuntimeExceptionWrapper.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/RuntimeExceptionWrapper.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/RuntimeExceptionWrapper.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/RuntimeExceptionWrapper.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
public class RuntimeExceptionWrapper extends RuntimeException {
private static final long serialVersionUID = 1L;
Copied: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java (from r1026611, incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/HeadlessViewerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java?p2=incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java&p1=incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/HeadlessViewerImpl.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/main/java/org/apache/isis/extensions/headless/viewer/internal/HeadlessViewerImpl.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal;
+package org.apache.isis.progmodel.wrapper.metamodel.internal;
import java.util.ArrayList;
import java.util.HashMap;
@@ -43,18 +43,18 @@ import org.apache.isis.applib.events.Pro
import org.apache.isis.applib.events.PropertyUsabilityEvent;
import org.apache.isis.applib.events.PropertyVisibilityEvent;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.extensions.headless.applib.HeadlessViewer;
-import org.apache.isis.extensions.headless.applib.ViewObject;
-import org.apache.isis.extensions.headless.applib.listeners.InteractionListener;
+import org.apache.isis.progmodel.wrapper.applib.WrappedObject;
+import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
+import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionListener;
-public class HeadlessViewerImpl implements HeadlessViewer {
+public class WrapperFactoryDefault implements WrapperFactory {
private final List<InteractionListener> listeners = new ArrayList<InteractionListener>();
private final Map<Class<? extends InteractionEvent>, InteractionEventDispatcher> dispatchersByEventClass = new HashMap<Class<? extends InteractionEvent>, InteractionEventDispatcher>();
private final RuntimeContext runtimeContext;
- public HeadlessViewerImpl(final RuntimeContext runtimeContext) {
+ public WrapperFactoryDefault(final RuntimeContext runtimeContext) {
this.runtimeContext = runtimeContext;
dispatchersByEventClass.put(ObjectTitleEvent.class, new InteractionEventDispatcherTypeSafe<ObjectTitleEvent>() {
@Override
@@ -195,19 +195,19 @@ public class HeadlessViewerImpl implemen
// Views
// /////////////////////////////////////////////////////////////
- public <T> T view(final T domainObject) {
- return view(domainObject, ExecutionMode.EXECUTE);
+ public <T> T wrap(final T domainObject) {
+ return wrap(domainObject, ExecutionMode.EXECUTE);
}
- public <T> T view(final T domainObject, ExecutionMode mode) {
- if (isView(domainObject)) {
+ public <T> T wrap(final T domainObject, ExecutionMode mode) {
+ if (isWrapper(domainObject)) {
return domainObject;
}
return Proxy.proxy(domainObject, this, mode, runtimeContext);
}
- public boolean isView(final Object possibleView) {
- return possibleView instanceof ViewObject;
+ public boolean isWrapper(final Object possibleWrapper) {
+ return possibleWrapper instanceof WrappedObject;
}
// /////////////////////////////////////////////////////////////
Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/util/Constants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/util/Constants.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/util/Constants.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/util/Constants.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal.util;
+package org.apache.isis.progmodel.wrapper.metamodel.internal.util;
Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/util/MethodPrefixFinder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/util/MethodPrefixFinder.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/util/MethodPrefixFinder.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/util/MethodPrefixFinder.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.viewer.internal.util;
+package org.apache.isis.progmodel.wrapper.metamodel.internal.util;
import java.util.Arrays;
import java.util.LinkedHashSet;
Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/pom.xml?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/pom.xml (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/pom.xml Wed Oct 27 17:00:06 2010
@@ -9,18 +9,18 @@
</parent>
<groupId>org.apache.isis.alternatives.progmodel</groupId>
- <artifactId>headless</artifactId>
+ <artifactId>wrapper</artifactId>
<version>0.1-SNAPSHOT</version>
-
- <name>Headless ProgModel</name>
-
+
+ <name>Wrapper ProgModel</name>
+
<packaging>pom</packaging>
<properties>
<siteBaseDir>../../..</siteBaseDir>
-
- <docbkx.title>Apache Isis Headless Programming Model</docbkx.title>
- <docbkx.outputName>isis-headless</docbkx.outputName>
+
+ <docbkx.title>Apache Isis Wrapper Programming Model</docbkx.title>
+ <docbkx.outputName>isis-wrapper</docbkx.outputName>
</properties>
<build>
@@ -35,8 +35,7 @@
<modules>
<module>applib</module>
- <module>viewer</module>
- <module>embedded</module>
+ <module>metamodel</module>
</modules>
<reporting>
@@ -70,23 +69,23 @@
<version>0.1-SNAPSHOT</version>
</dependency>
- <!-- headless applib -->
+ <!-- wrapper applib -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>headless-applib</artifactId>
+ <artifactId>wrapper-applib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>headless-applib</artifactId>
+ <artifactId>wrapper-applib</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
- <!-- headless viewer -->
+ <!-- wrapper impl -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>headless-viewer</artifactId>
+ <artifactId>wrapper-impl</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjector.java?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjector.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjector.java Wed Oct 27 17:00:06 2010
@@ -29,40 +29,40 @@ import org.apache.isis.commons.component
/**
* The repository of services, also able to inject into any object.
- *
+ *
* <p>
* The {@link #getContainer() domain object container} is always injected but
* is not a {@link #getRegisteredServices() registered service}.
*/
public interface ServicesInjector extends SessionScopedComponent, Injectable {
-
+
// ///////////////////////////////////////////////////////////////////////////
// Container
// ///////////////////////////////////////////////////////////////////////////
DomainObjectContainer getContainer();
-
+
/**
* Container to inject.
- *
+ *
* <p>
* This itself is injected.
*/
public void setContainer(final DomainObjectContainer container);
-
+
// ///////////////////////////////////////////////////////////////////////////
// Services
// ///////////////////////////////////////////////////////////////////////////
/**
* Services to be injected.
- *
+ *
* <p>
* Should automatically inject all services into each other (though calling
* {@link #open()} will also do this).
- *
+ *
* @param services
*/
void setServices(List<Object> services);
@@ -70,7 +70,7 @@ public interface ServicesInjector extend
/**
* All registered services, as an immutable {@link List}.
- *
+ *
* <p>
* Does not include the {@link #getContainer() container}.
*/
Modified: incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/CustomCssPackage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/CustomCssPackage.java?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/CustomCssPackage.java (original)
+++ incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/CustomCssPackage.java Wed Oct 27 17:00:06 2010
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.bdd.testapp.claims;
-import org.apache.isis.extensions.bdd.concordion.AbstractNakedObjectsConcordionTest;
+import org.apache.isis.viewer.bdd.concordion.AbstractNakedObjectsConcordionTest;
/**
* @see AbstractNakedObjectsConcordionTest#customCssPackage()
Modified: incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.java?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.java (original)
+++ incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.java Wed Oct 27 17:00:06 2010
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.bdd.testapp.claims.common;
-import org.apache.isis.extensions.bdd.concordion.AbstractNakedObjectsConcordionTest;
+import org.apache.isis.viewer.bdd.concordion.AbstractNakedObjectsConcordionTest;
public class BootstrapInExplorationMode extends AbstractNakedObjectsConcordionTest {
Modified: incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.java?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.java (original)
+++ incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.java Wed Oct 27 17:00:06 2010
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.bdd.testapp.claims.common;
-import org.apache.isis.extensions.bdd.concordion.AbstractNakedObjectsConcordionTest;
+import org.apache.isis.viewer.bdd.concordion.AbstractNakedObjectsConcordionTest;
public class Employees extends AbstractNakedObjectsConcordionTest {
Modified: incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.java?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.java (original)
+++ incubator/isis/trunk/examples/bdd-testapp/concordion/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.java Wed Oct 27 17:00:06 2010
@@ -1,7 +1,7 @@
package org.apache.isis.extensions.bdd.testapp.claims.stories;
-import org.apache.isis.extensions.bdd.concordion.AbstractNakedObjectsConcordionTest;
import org.apache.isis.extensions.bdd.testapp.claims.CustomCssPackage;
+import org.apache.isis.viewer.bdd.concordion.AbstractNakedObjectsConcordionTest;
public class NewClaimDefaultsOkStory extends AbstractNakedObjectsConcordionTest {
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/commandline/src/main/java/org/apache/isis/examples/wicket/app/claims/ClaimsApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/commandline/src/main/java/org/apache/isis/examples/wicket/app/claims/ClaimsApplication.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/commandline/src/main/java/org/apache/isis/examples/wicket/app/claims/ClaimsApplication.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/commandline/src/main/java/org/apache/isis/examples/wicket/app/claims/ClaimsApplication.java Wed Oct 27 17:00:06 2010
@@ -18,23 +18,23 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims;
+package org.apache.isis.examples.wicket.app.claims;
-import org.apache.isis.extensions.wicket.viewer.WicketObjectsApplication;
+import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
import com.google.inject.util.Modules;
-public class ClaimsApplication extends WicketObjectsApplication {
+public class ClaimsApplication extends IsisWicketApplication {
private static final long serialVersionUID = 1L;
@Override
- protected Module newWicketObjectsModule() {
+ protected Module newIsisWicketModule() {
return Modules.override(
- super.newWicketObjectsModule()).with(
+ super.newIsisWicketModule()).with(
new AbstractModule() {
@Override
protected void configure() {
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Approver.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Approver.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Approver.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Approver.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.dom.claim;
+package org.apache.isis.examples.apps.wicket.claims.dom.claim;
public interface Approver {
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Claim.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Claim.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Claim.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Claim.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.dom.claim;
+package org.apache.isis.examples.apps.wicket.claims.dom.claim;
import java.util.ArrayList;
import java.util.Collections;
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimItem.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimItem.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimItem.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.dom.claim;
+package org.apache.isis.examples.apps.wicket.claims.dom.claim;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimRepository.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimRepository.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimRepository.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.dom.claim;
+package org.apache.isis.examples.apps.wicket.claims.dom.claim;
import java.util.List;
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimWizard.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimWizard.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimWizard.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimWizard.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.dom.claim;
+package org.apache.isis.examples.apps.wicket.claims.dom.claim;
import java.util.Calendar;
import java.util.List;
@@ -30,8 +30,8 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.NotPersistable;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.extensions.wicket.applib.WizardPageDescription;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.employee.EmployeeRepository;
+import org.apache.isis.examples.apps.wicket.claims.dom.employee.EmployeeRepository;
+import org.apache.isis.viewer.wicket.applib.WizardPageDescription;
@NotPersistable
public class ClaimWizard extends AbstractDomainObject {
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Claimant.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Claimant.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Claimant.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/Claimant.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.dom.claim;
+package org.apache.isis.examples.apps.wicket.claims.dom.claim;
public interface Claimant {
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimantExpenseSummary.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimantExpenseSummary.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimantExpenseSummary.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/claim/ClaimantExpenseSummary.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.dom.claim;
+package org.apache.isis.examples.apps.wicket.claims.dom.claim;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Ignore;
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/employee/Employee.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/employee/Employee.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/employee/Employee.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/employee/Employee.java Wed Oct 27 17:00:06 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.dom.employee;
+package org.apache.isis.examples.apps.wicket.claims.dom.employee;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.Approver;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.Claimant;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.Approver;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.Claimant;
public class Employee extends AbstractDomainObject implements Claimant,
Approver /* , Locatable */{
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/employee/EmployeeRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/employee/EmployeeRepository.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/employee/EmployeeRepository.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/examples/apps/wicket/claims/dom/employee/EmployeeRepository.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.dom.employee;
+package org.apache.isis.examples.apps.wicket.claims.dom.employee;
import java.util.List;
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/examples/apps/wicket/claims/fixture/ClaimsFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/examples/apps/wicket/claims/fixture/ClaimsFixture.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/examples/apps/wicket/claims/fixture/ClaimsFixture.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/examples/apps/wicket/claims/fixture/ClaimsFixture.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.fixture;
+package org.apache.isis.examples.apps.wicket.claims.fixture;
import java.awt.Image;
import java.io.File;
@@ -29,9 +29,9 @@ import javax.imageio.ImageIO;
import org.apache.isis.applib.fixtures.AbstractFixture;
import org.apache.isis.applib.value.Date;
import org.apache.isis.applib.value.Money;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.Claim;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.ClaimItem;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.employee.Employee;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.Claim;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.ClaimItem;
+import org.apache.isis.examples.apps.wicket.claims.dom.employee.Employee;
public class ClaimsFixture extends AbstractFixture {
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/examples/apps/wicket/claims/fixture/ClaimsLogonFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/examples/apps/wicket/claims/fixture/ClaimsLogonFixture.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/examples/apps/wicket/claims/fixture/ClaimsLogonFixture.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/examples/apps/wicket/claims/fixture/ClaimsLogonFixture.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.fixture;
+package org.apache.isis.examples.apps.wicket.claims.fixture;
import org.apache.isis.applib.fixtures.LogonFixture;
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/service/src/main/java/org/apache/isis/examples/apps/wicket/claims/service/claim/ClaimRepositoryInMemory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/service/src/main/java/org/apache/isis/examples/apps/wicket/claims/service/claim/ClaimRepositoryInMemory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/service/src/main/java/org/apache/isis/examples/apps/wicket/claims/service/claim/ClaimRepositoryInMemory.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/service/src/main/java/org/apache/isis/examples/apps/wicket/claims/service/claim/ClaimRepositoryInMemory.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.service.claim;
+package org.apache.isis.examples.apps.wicket.claims.service.claim;
import java.util.ArrayList;
import java.util.List;
@@ -28,12 +28,12 @@ import org.apache.isis.applib.AbstractFa
import org.apache.isis.applib.Filter;
import org.apache.isis.applib.value.Date;
import org.apache.isis.applib.value.Money;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.Claim;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.ClaimItem;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.ClaimRepository;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.ClaimWizard;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.Claimant;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.ClaimantExpenseSummary;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.Claim;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.ClaimItem;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.ClaimRepository;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.ClaimWizard;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.Claimant;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.ClaimantExpenseSummary;
import com.google.common.collect.Maps;
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/service/src/main/java/org/apache/isis/examples/apps/wicket/claims/service/employee/EmployeeRepositoryInMemory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/service/src/main/java/org/apache/isis/examples/apps/wicket/claims/service/employee/EmployeeRepositoryInMemory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/service/src/main/java/org/apache/isis/examples/apps/wicket/claims/service/employee/EmployeeRepositoryInMemory.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/service/src/main/java/org/apache/isis/examples/apps/wicket/claims/service/employee/EmployeeRepositoryInMemory.java Wed Oct 27 17:00:06 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.service.employee;
+package org.apache.isis.examples.apps.wicket.claims.service.employee;
import java.util.List;
import org.apache.isis.applib.AbstractFactoryAndRepository;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.employee.Employee;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.employee.EmployeeRepository;
+import org.apache.isis.examples.apps.wicket.claims.dom.employee.Employee;
+import org.apache.isis.examples.apps.wicket.claims.dom.employee.EmployeeRepository;
public class EmployeeRepositoryInMemory extends AbstractFactoryAndRepository implements EmployeeRepository {
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/examples/apps/wicket/claims/ui/claimwizard/ClaimWizardComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/examples/apps/wicket/claims/ui/claimwizard/ClaimWizardComponentFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/examples/apps/wicket/claims/ui/claimwizard/ClaimWizardComponentFactory.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/examples/apps/wicket/claims/ui/claimwizard/ClaimWizardComponentFactory.java Wed Oct 27 17:00:06 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.ui.claimwizard;
+package org.apache.isis.examples.apps.wicket.claims.ui.claimwizard;
-import org.apache.isis.extensions.wicket.model.models.EntityModel;
-import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.ClaimWizard;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.components.entity.EntityComponentFactoryAbstract;
+import org.apache.isis.examples.apps.wicket.claims.dom.claim.ClaimWizard;
import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/examples/apps/wicket/claims/ui/claimwizard/ClaimWizardPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/examples/apps/wicket/claims/ui/claimwizard/ClaimWizardPanel.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/examples/apps/wicket/claims/ui/claimwizard/ClaimWizardPanel.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/examples/apps/wicket/claims/ui/claimwizard/ClaimWizardPanel.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.wicket.testapp.claims.ui.claimwizard;
+package org.apache.isis.examples.apps.wicket.claims.ui.claimwizard;
-import org.apache.isis.extensions.wicket.model.models.EntityModel;
-import org.apache.isis.extensions.wicket.ui.panels.ProcessObjectPanelAbstract;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.object.validate.ValidateObjectFacet;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.ui.panels.ProcessObjectPanelAbstract;
import org.apache.wicket.Session;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.markup.html.form.Button;
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/webapp/WEB-INF/web.xml?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/webapp/WEB-INF/web.xml Wed Oct 27 17:00:06 2010
@@ -19,7 +19,7 @@
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param>
<param-name>applicationClassName</param-name>
- <param-value>org.starobjects.wicket.viewer.app.WicketObjectsApplication</param-value>
+ <param-value>org.starobjects.wicket.viewer.app.IsisWicketApplication</param-value>
<!--
<param-value>org.nakedobjects.examples.claims.ClaimsApplication</param-value>
-->
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/resources/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/resources/isis.properties?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/resources/isis.properties (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/resources/isis.properties Wed Oct 27 17:00:06 2010
@@ -1,8 +1,8 @@
-isis.services.prefix = org.apache.isis.extensions.wicket.testapp.claims
-isis.services = service.employee.EmployeeRepositoryInMemory, \
- service.claim.ClaimRepositoryInMemory
+isis.services.prefix = org.apache.isis.examples.apps.wicket.claims.service
+isis.services = employee.EmployeeRepositoryInMemory, \
+ claim.ClaimRepositoryInMemory
-isis.fixtures.prefix= org.apache.isis.extensions.wicket.testapp.claims.fixture
+isis.fixtures.prefix= org.apache.isis.examples.apps.wicket.claims.fixture
isis.fixtures= ClaimsFixture
@@ -23,7 +23,7 @@ isis.persistor.domain-object-container=o
#isis.reflector.facets.include=org.apache.isis.runtime.authorization.standard.AuthorizationFacetFactoryImpl
#isis.authorization.learn=true
-isis.reflector.facets.include=org.apache.isis.extensions.wicket.metamodel.facets.WizardPageDescriptionAnnotationFacetFactory
+isis.reflector.facets.include=org.apache.isis.viewer.wicket.metamodel.facets.WizardPageDescriptionAnnotationFacetFactory
#isis.persistor=in-memory
isis.xmlos.dir=/tmp/xml
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/webapp/WEB-INF/logging.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/webapp/WEB-INF/logging.properties?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/webapp/WEB-INF/logging.properties (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/webapp/WEB-INF/logging.properties Wed Oct 27 17:00:06 2010
@@ -2,10 +2,6 @@
#log4j.rootCategory=DEBUG, Console, File
log4j.rootCategory=INFO, Console, File
-log4j.logger.org.nakedobjects.examples.simple.nos.simple-webapp.dnd=WARN
-log4j.logger.org.nakedobjects.examples.simple.nof.reflect.java.reflect.JavaIntrospector=DEBUG
-
-
# The console appender
log4j.appender.Console=org.apache.log4j.ConsoleAppender
log4j.appender.Console.target=System.out
@@ -14,7 +10,7 @@ log4j.appender.Console.layout.Conversion
log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=nakedobjects.log
+log4j.appender.File.file=isis.log
log4j.appender.File.append=false
#log4j.appender.File.maxFileSize=500KB
#log4j.appender.File.maxBackupIndex=1
Modified: incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml Wed Oct 27 17:00:06 2010
@@ -9,9 +9,9 @@
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param>
<param-name>applicationClassName</param-name>
- <param-value>org.apache.isis.extensions.wicket.viewer.WicketObjectsApplication</param-value>
+ <param-value>org.apache.isis.viewer.wicket.viewer.IsisWicketApplication</param-value>
<!--
- <param-value>org.apache.isis.extensions.wicket.testapp.claims.ClaimsApplication</param-value>
+ <param-value>org.apache.isis.examples.apps.wicket.claims.ClaimsApplication</param-value>
-->
</init-param>
</filter>
@@ -20,5 +20,5 @@
<filter-name>wicket.claims</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
</web-app>
Modified: incubator/isis/trunk/examples/wicket-testapp/simpleapp/wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/simpleapp/wicket/pom.xml?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/simpleapp/wicket/pom.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/simpleapp/wicket/pom.xml Wed Oct 27 17:00:06 2010
@@ -7,13 +7,13 @@
<artifactId>simpleapp</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
-
+
<name>Wicket</name>
<artifactId>simpleapp-wicket</artifactId>
<packaging>war</packaging>
-
+
<properties>
- <wicketobjects.version>0.1-SNAPSHOT</wicketobjects.version>
+ <isis.wicketviewer.version>0.1-SNAPSHOT</isis.wicketviewer.version>
<jetty.version>6.1.4</jetty.version>
</properties>
@@ -25,92 +25,44 @@
</plugin>
</plugins>
</build>
-
- <repositories>
- <!-- bootstrap parent corporate POM -->
- <repository>
- <id>starobjects-release</id>
- <url>http://starobjects.sourceforge.net/m2-repo/release</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <!-- latest-n-greatest -->
- <repository>
- <id>starobjects-snapshot</id>
- <url>http://starobjects.sourceforge.net/m2-repo/snapshot</url>
- <!-- <url>file://L:/Dev/java/.m2/repository</url> -->
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
- <dependencies>
+
+ <dependencies>
<!-- other modules in this project -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>simpleapp-service</artifactId>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>simpleapp-fixture</artifactId>
</dependency>
-
- <!-- naked objects -->
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>webserver</artifactId>
+ </dependency>
<dependency>
- <groupId>org.nakedobjects.core</groupId>
- <artifactId>bytecode-cglib</artifactId>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>bytecode</artifactId>
</dependency>
<dependency>
- <groupId>org.nakedobjects.core</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>bytecode-javassist</artifactId>
</dependency>
<dependency>
- <groupId>org.nakedobjects.core</groupId>
- <artifactId>remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nakedobjects.plugins</groupId>
- <artifactId>html-viewer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nakedobjects.plugins</groupId>
- <artifactId>http-remoting-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nakedobjects.plugins</groupId>
- <artifactId>headless-embedded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nakedobjects.plugins</groupId>
- <artifactId>xml-persistor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nakedobjects.core</groupId>
- <artifactId>webserver</artifactId>
+ <groupId>org.apache.isis.alternatives.objectstore</groupId>
+ <artifactId>xml</artifactId>
</dependency>
-
- <!-- WicketObjects -->
- <dependency>
- <groupId>org.starobjects.wicket</groupId>
- <artifactId>applib</artifactId>
- <version>${wicketobjects.version}</version>
- </dependency>
+ <!-- WicketObjects -->
<dependency>
- <groupId>org.starobjects.wicket</groupId>
- <artifactId>viewer</artifactId>
- <version>${wicketobjects.version}</version>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>wicket-viewer</artifactId>
+ <version>${isis.wicketviewer.version}</version>
</dependency>
<!-- JETTY DEPENDENCIES FOR TESTING -->
@@ -138,6 +90,6 @@
<version>0.1-SNAPSHOT</version>
<type>pom</type>
</dependency>
-
+
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/isis/trunk/examples/wicket-testapp/simpleapp/wicket/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/simpleapp/wicket/src/main/webapp/WEB-INF/web.xml?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/simpleapp/wicket/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/simpleapp/wicket/src/main/webapp/WEB-INF/web.xml Wed Oct 27 17:00:06 2010
@@ -9,8 +9,7 @@
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param>
<param-name>applicationClassName</param-name>
- <param-value>org.starobjects.wicket.viewer.WicketObjectsApplication</param-value>
- <!-- <param-value>org.starobjects.wicket.viewer.app.WicketObjectsApplication</param-value> -->
+ <param-value>org.starobjects.wicket.viewer.IsisWicketApplication</param-value>
</init-param>
</filter>
Modified: incubator/isis/trunk/release/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/release/pom.xml?rev=1028037&r1=1028036&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/release/pom.xml (original)
+++ incubator/isis/trunk/release/pom.xml Wed Oct 27 17:00:06 2010
@@ -17,7 +17,7 @@
It is designed to be imported into an application module, using a scope=import (Maven 2.0.9 onwards) in the
dependencyManagement section, and importing this module's dependencyManagement section in turn.
Alternatively, it can be in inherited from, but note that any elements that this module inherits
- from its parent (an ultimately, the org.apache:apache corporate POM), will need to be overridden.
+ from its parent (an ultimately, the org.apache:apache corporate POM), will need to be overridden.
</description>
<packaging>pom</packaging>
@@ -41,13 +41,15 @@
<isis.alternatives-bytecode.version>0.1-SNAPSHOT</isis.alternatives-bytecode.version>
<isis.alternatives-progmodel-groovy.version>0.1-SNAPSHOT</isis.alternatives-progmodel-groovy.version>
- <isis.alternatives-progmodel-headless.version>0.1-SNAPSHOT</isis.alternatives-progmodel-headless.version>
+ <isis.alternatives-progmodel-wrapper.version>0.1-SNAPSHOT</isis.alternatives-progmodel-wrapper.version>
<!-- used for common, transport-sockets, marshalling-encoding, marshalling-serialize -->
<isis.alternatives-remoting.version>0.1-SNAPSHOT</isis.alternatives-remoting.version>
<isis.alternatives-security-ldap.version>0.1-SNAPSHOT</isis.alternatives-security-ldap.version>
<isis.alternatives-security-file.version>0.1-SNAPSHOT</isis.alternatives-security-file.version>
+
+ <isis.alternatives-embedded.version>0.1-SNAPSHOT</isis.alternatives-embedded.version>
</properties>
<dependencyManagement>
@@ -249,25 +251,20 @@
<version>${isis.alternatives-objectstore-sql.version}</version>
</dependency>
- <!-- alternatives: progmodel: headless -->
- <dependency>
- <groupId>org.apache.isis.alternatives.progmodel</groupId>
- <artifactId>headless</artifactId>
- <version>${isis.alternatives-progmodel-headless.version}</version>
- </dependency>
+ <!-- alternatives: progmodel: wrapper -->
<dependency>
<groupId>org.apache.isis.alternatives.progmodel</groupId>
- <artifactId>headless-applib</artifactId>
- <version>${isis.alternatives-progmodel-headless.version}</version>
+ <artifactId>wrapper</artifactId>
+ <version>${isis.alternatives-progmodel-wrapper.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.alternatives.progmodel</groupId>
- <artifactId>headless-embedded</artifactId>
+ <artifactId>wrapper-applib</artifactId>
<version>${isis.alternatives-progmodel-headless.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.alternatives.progmodel</groupId>
- <artifactId>headless-viewer</artifactId>
+ <artifactId>wrapper-embedded</artifactId>
<version>${isis.alternatives-progmodel-headless.version}</version>
</dependency>
@@ -321,6 +318,14 @@
<artifactId>marshalling-xstream</artifactId>
<version>${isis.alternatives-remoting-marshalling-xstream.version}</version>
</dependency>
+
+ <!-- alternatives: embedded -->
+ <dependency>
+ <groupId>org.apache.isis.alternatives</groupId>
+ <artifactId>embedded</artifactId>
+ <version>${isis.alternatives-embedded.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Copied: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java (from r1026611, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/AliasRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java?p2=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java&p1=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/AliasRegistry.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/AliasRegistry.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.bdd.common;
+package org.apache.isis.viewer.bdd.common;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
Copied: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java (from r1026611, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/CellBinding.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java?p2=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java&p1=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/CellBinding.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/CellBinding.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java Wed Oct 27 17:00:06 2010
@@ -1,9 +1,9 @@
-package org.apache.isis.extensions.bdd.common;
+package org.apache.isis.viewer.bdd.common;
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.extensions.bdd.common.util.Strings;
+import org.apache.isis.viewer.bdd.common.util.Strings;
public abstract class CellBinding {
Copied: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Constants.java (from r1026611, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/Constants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Constants.java?p2=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Constants.java&p1=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/Constants.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/Constants.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Constants.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.bdd.common;
+package org.apache.isis.viewer.bdd.common;
public final class Constants {
Copied: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ServiceRegistry.java (from r1026611, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/ServiceRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ServiceRegistry.java?p2=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ServiceRegistry.java&p1=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/ServiceRegistry.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/ServiceRegistry.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ServiceRegistry.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.bdd.common;
+package org.apache.isis.viewer.bdd.common;
public interface ServiceRegistry {
Copied: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java (from r1026611, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/Story.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java?p2=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java&p1=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/Story.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/Story.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.bdd.common;
+package org.apache.isis.viewer.bdd.common;
import java.util.Date;
import java.util.Iterator;
@@ -6,14 +6,6 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.extensions.bdd.common.story.bootstrapping.InitNakedObjects;
-import org.apache.isis.extensions.bdd.common.story.bootstrapping.OpenSession;
-import org.apache.isis.extensions.bdd.common.story.bootstrapping.SetClock;
-import org.apache.isis.extensions.bdd.common.story.bootstrapping.ShutdownNakedObjects;
-import org.apache.isis.extensions.bdd.common.story.bootstrapping.StartClient;
-import org.apache.isis.extensions.bdd.common.story.registries.AliasRegistryDefault;
-import org.apache.isis.extensions.bdd.common.story.registries.AliasRegistrySpi;
-import org.apache.isis.extensions.bdd.common.util.Strings;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.AggregatedOid;
import org.apache.isis.runtime.context.IsisContext;
@@ -23,6 +15,14 @@ import org.apache.isis.runtime.persisten
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.IsisSystem;
import org.apache.isis.runtime.transaction.IsisTransactionManager;
+import org.apache.isis.viewer.bdd.common.story.bootstrapping.InitNakedObjects;
+import org.apache.isis.viewer.bdd.common.story.bootstrapping.OpenSession;
+import org.apache.isis.viewer.bdd.common.story.bootstrapping.SetClock;
+import org.apache.isis.viewer.bdd.common.story.bootstrapping.ShutdownNakedObjects;
+import org.apache.isis.viewer.bdd.common.story.bootstrapping.StartClient;
+import org.apache.isis.viewer.bdd.common.story.registries.AliasRegistryDefault;
+import org.apache.isis.viewer.bdd.common.story.registries.AliasRegistrySpi;
+import org.apache.isis.viewer.bdd.common.util.Strings;
/**
* Holds the bootstrapped {@link NakedObjectsSystem} and provides access to
Copied: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/StoryBootstrapper.java (from r1026611, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/StoryBootstrapper.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/StoryBootstrapper.java?p2=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/StoryBootstrapper.java&p1=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/StoryBootstrapper.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/StoryBootstrapper.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/StoryBootstrapper.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.bdd.common;
+package org.apache.isis.viewer.bdd.common;
import java.util.Date;