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 2013/09/09 14:10:35 UTC

git commit: ISIS-520: support --type for Wicket viewer...

Updated Branches:
  refs/heads/master 663c1f7ca -> a0771d73a


ISIS-520: support --type for Wicket viewer...

... when run using org.apache.isis.WebServer (ie embedded jetty).


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a0771d73
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a0771d73
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a0771d73

Branch: refs/heads/master
Commit: a0771d73abf5967141351cc400b65912a3f3a0c2
Parents: 663c1f7
Author: Dan Haywood <da...@apache.org>
Authored: Mon Sep 9 13:10:14 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Sep 9 13:10:14 2013 +0100

----------------------------------------------------------------------
 .../jdo/service/RegisterEntities.java           | 22 +++++++++
 .../wicket/viewer/IsisWicketApplication.java    | 43 +++++++++++++++--
 .../isis/DeploymentTypeWicketAbstract.java      | 50 ++++++++++++++++++++
 .../viewer/integration/isis/WicketServer.java   |  2 +-
 .../integration/isis/WicketServerPrototype.java |  2 +-
 .../launch/ToDoApp-no-fixtures-PROTOTYPE.launch | 24 ++++++++++
 .../launch/ToDoApp-no-fixtures-SERVER.launch    | 20 ++++++++
 .../eclipse/launch/ToDoApp-with-fixtures.launch | 24 ++++++++++
 ...cket_restful_jdo-webapp-with-fixtures.launch | 24 ----------
 .../quickstart_wicket_restful_jdo-webapp.launch | 19 --------
 10 files changed, 181 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
index a1750f5..f985f3c 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
@@ -25,7 +25,9 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.jdo.annotations.PersistenceCapable;
 
+import com.google.common.base.Predicate;
 import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
 
 import org.reflections.Reflections;
 import org.slf4j.Logger;
@@ -67,11 +69,31 @@ public class RegisterEntities {
             Set<Class<?>> entityTypes = 
                     reflections.getTypesAnnotatedWith(PersistenceCapable.class);
             
+            if(noEntitiesIn(entityTypes)) {
+                LOG.error("Could not locate any PersistenceCapable entities in " + packagePrefix);
+            }
             for (Class<?> entityType : entityTypes) {
                 IsisContext.getSpecificationLoader().loadSpecification(entityType);
             }
         }
     }
+
+    /**
+     * {@link Reflections} seems to return a set with 1 null element if none can be found.
+     */
+    private static boolean noEntitiesIn(Set<Class<?>> entityTypes) {
+        return Iterables.filter(entityTypes, nullClass()).iterator().hasNext();
+    }
+
+    private static Predicate<Class<?>> nullClass() {
+        return new Predicate<Class<?>>() {
+
+            @Override
+            public boolean apply(Class<?> input) {
+                return input == null;
+            }
+        };
+    }
     
     
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 57f071e..2d3b100 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -35,6 +35,7 @@ import org.apache.wicket.Application;
 import org.apache.wicket.ConverterLocator;
 import org.apache.wicket.IConverterLocator;
 import org.apache.wicket.Page;
+import org.apache.wicket.RuntimeConfigurationType;
 import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
 import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
 import org.apache.wicket.guice.GuiceComponentInjector;
@@ -46,6 +47,7 @@ import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
 import org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStreams;
@@ -75,6 +77,7 @@ import org.apache.isis.viewer.wicket.ui.pages.BookmarkedPagesModelProvider;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
+import org.apache.isis.viewer.wicket.viewer.integration.isis.DeploymentTypeWicketAbstract;
 import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServer;
 import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServerPrototype;
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
@@ -172,6 +175,8 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
 
     private BookmarkedPagesModel bookmarkedPagesModel;
 
+    private DeploymentTypeWicketAbstract deploymentType;
+
 
     // /////////////////////////////////////////////////
     // constructor, init
@@ -198,10 +203,10 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
 
         getResourceSettings().setParentFolderPlaceholder("$up$");
 
-        final DeploymentType deploymentType = determineDeploymentType();
-
         final IsisConfigurationBuilder isisConfigurationBuilder = createConfigBuilder();
 
+        determineDeploymentTypeIfRequired();
+
         final IsisInjectModule isisModule = newIsisModule(deploymentType, isisConfigurationBuilder);
         final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
         injector.injectMembers(this);
@@ -211,18 +216,48 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
         initWicketComponentInjection(injector);
     }
     
+    private void determineDeploymentTypeIfRequired() {
+        if(deploymentType != null) {
+            return;
+        }
+        
+        final IsisConfigurationBuilder isisConfigurationBuilder = createConfigBuilder();
+        final IsisConfiguration configuration = isisConfigurationBuilder.getConfiguration();
+        String deploymentTypeFromConfig = configuration.getString("isis.deploymentType");
+        deploymentType = determineDeploymentType(deploymentTypeFromConfig);
+    }
+
     @Override
     protected void onDestroy() {
         IsisContext.shutdown();
         super.onDestroy();
     }
 
+    @Override
+    public RuntimeConfigurationType getConfigurationType() {
+        determineDeploymentTypeIfRequired();
+        return deploymentType.getConfigurationType();
+    }
+    
+    
     protected IsisInjectModule newIsisModule(final DeploymentType deploymentType, final IsisConfigurationBuilder isisConfigurationBuilder) {
         return new IsisInjectModule(deploymentType, isisConfigurationBuilder);
     }
 
-    private DeploymentType determineDeploymentType() {
-        return usesDevelopmentConfig() ? new WicketServerPrototype() : new WicketServer();
+    private DeploymentTypeWicketAbstract determineDeploymentType(String deploymentTypeFromConfig) {
+        final DeploymentTypeWicketAbstract prototype = new WicketServerPrototype();
+        final DeploymentTypeWicketAbstract deployment = new WicketServer();
+        
+        if(deploymentTypeFromConfig != null) {
+            final DeploymentType deploymentType = DeploymentType.lookup(deploymentTypeFromConfig);
+            return !deploymentType.getDeploymentCategory().isProduction() 
+                    ? prototype 
+                    : deployment;
+        } else {
+            return usesDevelopmentConfig() 
+                    ? prototype 
+                    : deployment;
+        }
     }
 
     private IsisConfigurationBuilder createConfigBuilder() {

http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeWicketAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeWicketAbstract.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeWicketAbstract.java
new file mode 100644
index 0000000..20edefc
--- /dev/null
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeWicketAbstract.java
@@ -0,0 +1,50 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.viewer.wicket.viewer.integration.isis;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.RuntimeConfigurationType;
+
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
+import org.apache.isis.viewer.wicket.viewer.IsisWicketUnsecuredApplication;
+
+/**
+ * {@link DeploymentType} for production usage.
+ * 
+ * <p>
+ * In {@link IsisWicketApplication} and {@link IsisWicketUnsecuredApplication} there
+ * is logic to select either this {@link DeploymentType} or {@link WicketServerPrototype}
+ * depending on the value of Wicket's own
+ * {@link Application#getConfigurationType() configuration mode}. 
+ */
+public class DeploymentTypeWicketAbstract extends DeploymentTypeAbstract {
+
+    public DeploymentTypeWicketAbstract(
+            final String name, final DeploymentCategory deploymentCategory) {
+        super(name, deploymentCategory);
+    }
+
+    public RuntimeConfigurationType getConfigurationType() {
+        return getDeploymentCategory().isProduction()? RuntimeConfigurationType.DEPLOYMENT: RuntimeConfigurationType.DEVELOPMENT;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java
index d9d597b..ae3f929 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java
@@ -35,7 +35,7 @@ import org.apache.isis.viewer.wicket.viewer.IsisWicketUnsecuredApplication;
  * depending on the value of Wicket's own
  * {@link Application#getConfigurationType() configuration mode}. 
  */
-public class WicketServer extends DeploymentTypeAbstract {
+public class WicketServer extends DeploymentTypeWicketAbstract {
 
     public WicketServer() {
         super("WICKET_SERVER", DeploymentCategory.PRODUCTION);

http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
index e0a5bd4..c3bef4e 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
@@ -33,7 +33,7 @@ import org.apache.isis.viewer.wicket.viewer.IsisWicketUnsecuredApplication;
  * depending on the value of Wicket's own
  * {@link Application#getConfigurationType() configuration mode}. 
  */
-public class WicketServerPrototype extends DeploymentTypeAbstract {
+public class WicketServerPrototype extends DeploymentTypeWicketAbstract {
 
     public WicketServerPrototype() {
         super("WICKET_SERVER_PROTOTYPE", DeploymentCategory.PROTOTYPING);

http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-no-fixtures-PROTOTYPE.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-no-fixtures-PROTOTYPE.launch b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-no-fixtures-PROTOTYPE.launch
new file mode 100644
index 0000000..a97f785
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-no-fixtures-PROTOTYPE.launch
@@ -0,0 +1,24 @@
+<?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"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<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.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER_PROTOTYPE"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-no-fixtures-SERVER.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-no-fixtures-SERVER.launch b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-no-fixtures-SERVER.launch
new file mode 100644
index 0000000..aeda3bc
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-no-fixtures-SERVER.launch
@@ -0,0 +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.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.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-with-fixtures.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-with-fixtures.launch b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-with-fixtures.launch
new file mode 100644
index 0000000..4a99c58
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-with-fixtures.launch
@@ -0,0 +1,24 @@
+<?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"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<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.PROGRAM_ARGUMENTS" value="--port 8080 -D isis.persistor.datanucleus.install-fixtures=true --type SERVER_PROTOTYPE"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-webapp-with-fixtures.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-webapp-with-fixtures.launch b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-webapp-with-fixtures.launch
deleted file mode 100644
index 3d56400..0000000
--- a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-webapp-with-fixtures.launch
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<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.PROGRAM_ARGUMENTS" value="--port 8080 -D isis.persistor.datanucleus.install-fixtures=true -t SERVER_EXPLORATION"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/isis/blob/a0771d73/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-webapp.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-webapp.launch b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-webapp.launch
deleted file mode 100644
index c159496..0000000
--- a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-webapp.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="quickstart_wicket_restful_jdo-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>