svn commit: r1141016 - in /incubator/isis/trunk/examples/quickstart: quickrun/ide/eclipse/launch/ viewer-html/ide/eclipse/launch/ viewer-json/src/main/webapp/WEB-INF/

[da...@apache.org]

Author: danhaywood
Date: Wed Jun 29 09:10:40 2011
New Revision: 1141016

URL: http://svn.apache.org/viewvc?rev=1141016&view=rev
Log:
fixes to quickstart app

Added:
    incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-json.launch
    incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-xhtml.launch
      - copied, changed from r1140336, incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-restful.launch
Removed:
    incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-restful.launch
Modified:
    incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch
    incubator/isis/trunk/examples/quickstart/viewer-json/src/main/webapp/WEB-INF/web.xml

Added: incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-json.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-json.launch?rev=1141016&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-json.launch (added)
+++ incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-json.launch Wed Jun 29 09:10:40 2011
@@ -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.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.maven.ide.eclipse.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 json"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-quickrun"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
+</launchConfiguration>

Copied: incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-xhtml.launch (from r1140336, incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-restful.launch)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-xhtml.launch?p2=incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-xhtml.launch&p1=incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-restful.launch&r1=1140336&r2=1141016&rev=1141016&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-restful.launch (original)
+++ incubator/isis/trunk/examples/quickstart/quickrun/ide/eclipse/launch/quickstart-quickrun-xhtml.launch Wed Jun 29 09:10:40 2011
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.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 org.apache.isis.viewer.restful.viewer.embedded.RestfulViewerInstaller"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration --viewer xhtml"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-quickrun"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Modified: incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch?rev=1141016&r1=1141015&r2=1141016&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch Wed Jun 29 09:10:40 2011
@@ -1,7 +1,10 @@
 <?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="4"/>
+<listEntry value="1"/>
 </listAttribute>
 <mapAttribute key="org.eclipse.debug.core.preferred_launchers">
 <mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>

Modified: incubator/isis/trunk/examples/quickstart/viewer-json/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-json/src/main/webapp/WEB-INF/web.xml?rev=1141016&r1=1141015&r2=1141016&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-json/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-json/src/main/webapp/WEB-INF/web.xml Wed Jun 29 09:10:40 2011
@@ -113,5 +113,9 @@
 		<servlet-name>Resource</servlet-name>
 		<url-pattern>*.png</url-pattern>
 	</servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>Resource</servlet-name>
+        <url-pattern>*.html</url-pattern>
+    </servlet-mapping>
 
 </web-app>