incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1226153 [2/2] - in /incubator/isis/trunk/framework: ./ core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ core/metamodel/src/main/java/org/apache/isis/core/...
Date Sat, 31 Dec 2011 18:10:54 GMT
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java
(original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java
Sat Dec 31 18:10:52 2011
@@ -38,10 +38,12 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.layout.MemberLayoutArranger;
 import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
@@ -49,10 +51,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
 import org.apache.isis.core.progmodel.layout.dflt.MemberLayoutArrangerDefault;
 import org.apache.isis.core.progmodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
-import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
-import org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory;
 import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
-import org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity;
 import org.apache.isis.runtimes.embedded.internal.RuntimeContextForEmbeddedMetaModel;
 
 import com.google.common.collect.Lists;
@@ -83,8 +82,7 @@ public class IsisMetaModel implements Ap
     private Set<FacetDecorator> facetDecorators;
     private MetaModelValidator metaModelValidator;
 
-    private WrapperFactory wrapperFactory;
-	private DomainObjectContainerWrapperFactory container;
+	private DomainObjectContainer container;
 
     public IsisMetaModel(final EmbeddedContext context, final Object... services) {
         this(context, Arrays.asList(services));
@@ -93,7 +91,7 @@ public class IsisMetaModel implements Ap
     public IsisMetaModel(final EmbeddedContext context, final List<Object> services)
{
         this.services.addAll(services);
         setConfiguration(new IsisConfigurationDefault());
-        setClassSubstitutor(new ClassSubstitutorIdentity());
+        setClassSubstitutor(new ClassSubstitutorAbstract(){});
         setCollectionTypeRegistry(new CollectionTypeRegistryDefault());
         setSpecificationTraverser(new SpecificationTraverserDefault());
         setMemberLayoutArranger(new MemberLayoutArrangerDefault());
@@ -129,7 +127,7 @@ public class IsisMetaModel implements Ap
                 memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
 
         runtimeContext = new RuntimeContextForEmbeddedMetaModel(context, services);
-        this.container = new DomainObjectContainerWrapperFactory();
+        this.container = new DomainObjectContainerDefault();
 
         runtimeContext.injectInto(container);
         runtimeContext.setContainer(container);
@@ -144,8 +142,6 @@ public class IsisMetaModel implements Ap
             serviceSpec.markAsService();
         }
         state = State.INITIALIZED;
-
-        wrapperFactory = container;
     }
 
     @Override
@@ -166,19 +162,7 @@ public class IsisMetaModel implements Ap
     }
 
     // ///////////////////////////////////////////////////////
-    // WrapperFactory
-    // ///////////////////////////////////////////////////////
-
-    /**
-     * Available once {@link #init() initialized}.
-     */
-    public WrapperFactory getWrapperFactory() {
-        ensureInitialized();
-        return wrapperFactory;
-    }
-
-    // ///////////////////////////////////////////////////////
-    // WrapperFactory
+    // DomainObjectContainer
     // ///////////////////////////////////////////////////////
 
     /**

Copied: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/PersistenceState.java
(from r1225837, incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/PersistenceState.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/PersistenceState.java?p2=incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/PersistenceState.java&p1=incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/PersistenceState.java&r1=1225837&r2=1226153&rev=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/PersistenceState.java
(original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/PersistenceState.java
Sat Dec 31 18:10:52 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtimes.embedded.internal;
+package org.apache.isis.runtimes.embedded;
 
 public enum PersistenceState {
     TRANSIENT(true, false), PERSISTENT(false, true), STANDALONE(false, false);

Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java
(original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java
Sat Dec 31 18:10:52 2011
@@ -57,6 +57,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification.CreationMode;
 import org.apache.isis.runtimes.embedded.EmbeddedContext;
+import org.apache.isis.runtimes.embedded.PersistenceState;
 
 /**
  * Acts as a bridge between the {@link RuntimeContext} (as used internally within the meta-model)
and the

Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/ServiceAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/ServiceAdapter.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/ServiceAdapter.java
(original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/ServiceAdapter.java
Sat Dec 31 18:10:52 2011
@@ -20,6 +20,7 @@
 package org.apache.isis.runtimes.embedded.internal;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.runtimes.embedded.PersistenceState;
 
 public class ServiceAdapter extends StandaloneAdapter {
 

Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java
(original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java
Sat Dec 31 18:10:52 2011
@@ -21,7 +21,6 @@ package org.apache.isis.runtimes.embedde
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.version.Version;
 import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
@@ -29,9 +28,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.ObjectMetaModel;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Specification;
-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.embedded.PersistenceState;
 
 /**
  * Only provides a concrete implementation of the methods corresponding to the {@link ObjectMetaModel}
interface.
@@ -239,24 +236,7 @@ public class StandaloneAdapter implement
 
     @Override
     public ObjectAdapter getAggregateRoot() {
-        if (getSpecification().isAggregated()) {
-            final Oid parentOid = ((AggregatedOid) this.getOid()).getParentOid();
-            return getAdapterManager().getAdapterFor(parentOid);
-        } else {
-            return this;
-        }
-    }
-
-    // ////////////////////////////////////////////////////////////////
-    // Dependencies (from context)
-    // ////////////////////////////////////////////////////////////////
-
-    protected AdapterManager getAdapterManager() {
-        return getPersistenceSession().getAdapterManager();
-    }
-
-    protected PersistenceSession getPersistenceSession() {
-        return IsisContext.getPersistenceSession();
+    	throw new UnsupportedOperationException();
     }
 
 }

Copied: incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getDomainObjectContainer.java
(from r1225837, incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getWrapperFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getDomainObjectContainer.java?p2=incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getDomainObjectContainer.java&p1=incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getWrapperFactory.java&r1=1225837&r2=1226153&rev=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getWrapperFactory.java
(original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_getDomainObjectContainer.java
Sat Dec 31 18:10:52 2011
@@ -23,8 +23,6 @@ import static org.hamcrest.CoreMatchers.
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.runtimes.embedded.dom.claim.ClaimRepositoryImpl;
-import org.apache.isis.runtimes.embedded.dom.employee.EmployeeRepositoryImpl;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
@@ -33,7 +31,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(JMock.class)
-public class IsisMetaModelTest_getWrapperFactory {
+public class IsisMetaModelTest_getDomainObjectContainer {
 
     private final Mockery mockery = new JUnit4Mockery();
 
@@ -51,7 +49,7 @@ public class IsisMetaModelTest_getWrappe
 
     @Test
     public void happyCase() {
-        assertThat(metaModel.getWrapperFactory(), is(notNullValue()));
+        assertThat(metaModel.getDomainObjectContainer(), is(notNullValue()));
     }
 
 }

Modified: incubator/isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch
(original)
+++ incubator/isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch
Sat Dec 31 18:10:52 2011
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.apache.isis.runtimes.dflt.runtime/src/main/java/org/apache/isis/Isis.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.Isis"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration
--viewer dnd"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.dnd-tck"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.apache.isis.runtimes.dflt.runtime/src/main/java/org/apache/isis/Isis.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.Isis"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration
--viewer dnd"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.dnd-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>

Modified: incubator/isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch
(original)
+++ incubator/isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch
Sat Dec 31 18:10:52 2011
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.html-tck"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.html-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>

Modified: incubator/isis/trunk/framework/viewer/json/json-tck/ide/eclipse/launch/viewer-json-tck.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-tck/ide/eclipse/launch/viewer-json-tck.launch?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-tck/ide/eclipse/launch/viewer-json-tck.launch
(original)
+++ incubator/isis/trunk/framework/viewer/json/json-tck/ide/eclipse/launch/viewer-json-tck.launch
Sat Dec 31 18:10:52 2011
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.json-tck"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.json-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>

Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch
(original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch
Sat Dec 31 18:10:52 2011
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.scimpi-tck"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.scimpi-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch?rev=1226153&r1=1226152&r2=1226153&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch
Sat Dec 31 18:10:52 2011
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.wicket-tck"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.wicket-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>



Mime
View raw message