Author: [email protected]
Date: Wed Jun 24 10:15:17 2009
New Revision: 5628
Added:
trunk/eclipse/reference/code-museum/SingleIssue.launch
trunk/eclipse/reference/code-museum/war/
trunk/eclipse/reference/code-museum/war/DefaultMuseum.html (contents,
props changed)
trunk/eclipse/reference/code-museum/war/SingleIssue.html (contents,
props changed)
trunk/eclipse/reference/code-museum/war/WEB-INF/
trunk/eclipse/reference/code-museum/war/WEB-INF/classes/
trunk/eclipse/reference/code-museum/war/WEB-INF/classes/marker
trunk/eclipse/reference/code-museum/war/WEB-INF/web.xml
Removed:
trunk/reference/code-museum/src/com/google/gwt/museum/public/DefaultMuseum.html
trunk/reference/code-museum/src/com/google/gwt/museum/public/Museum.html
trunk/reference/code-museum/src/com/google/gwt/museum/public/SingleIssue.html
Modified:
trunk/eclipse/reference/code-museum/DefaultMuseum.launch
trunk/reference/code-museum/src/com/google/gwt/museum/DefaultMuseum.gwt.xml
trunk/reference/code-museum/src/com/google/gwt/museum/Museum.gwt.xml
trunk/reference/code-museum/src/com/google/gwt/museum/SingleIssue.gwt.xml
trunk/reference/code-museum/src/com/google/gwt/museum/client/common/AbstractIssue.java
Log:
Updates the code museum to use HostedMode instead of GWTShell, and adds a
war/ directory.
Patch by: jlabanca
Review by: jgw
Modified: trunk/eclipse/reference/code-museum/DefaultMuseum.launch
==============================================================================
--- trunk/eclipse/reference/code-museum/DefaultMuseum.launch (original)
+++ trunk/eclipse/reference/code-museum/DefaultMuseum.launch Wed Jun 24
10:15:17 2009
@@ -17,8 +17,8 @@
<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?> <runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento
exportedEntriesOnly="false"
project="code-museum"/> </runtimeClasspathEntry> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="com.google.gwt.dev.GWTShell"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-out www com.google.gwt.museum.DefaultMuseum/DefaultMuseum.html"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="com.google.gwt.dev.HostedMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-startupUrl
DefaultMuseum.html com.google.gwt.museum.DefaultMuseum"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="code-museum"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Dgwt.devjar=${gwt_devjar}""/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-ea -Xmx256M -Dgwt.devjar=${gwt_devjar}""/>
</launchConfiguration>
Added: trunk/eclipse/reference/code-museum/SingleIssue.launch
==============================================================================
--- (empty file)
+++ trunk/eclipse/reference/code-museum/SingleIssue.launch Wed Jun 24
10:15:17 2009
@@ -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="/code-museum"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables"
value="true"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?> <runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="code-museum" path="1"
type="4"/> "/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?> <runtimeClasspathEntry
internalArchive="/code-museum/src" path="3"
type="2"/> "/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?> <runtimeClasspathEntry
internalArchive="/gwt-user/core/src" path="3"
type="2"/> "/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?> <runtimeClasspathEntry
internalArchive="/gwt-dev-linux/core/src" path="3"
type="2"/> "/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?> <runtimeClasspathEntry
internalArchive="/gwt-user/core/super" path="3"
type="2"/> "/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?> <runtimeClasspathEntry
internalArchive="/gwt-dev-linux/core/super" path="3"
type="2"/> "/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?> <runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento
exportedEntriesOnly="false"
project="code-museum"/> </runtimeClasspathEntry> "/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="com.google.gwt.dev.HostedMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-startupUrl SingleIssue.html com.google.gwt.museum.SingleIssue"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="code-museum"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-ea -Xmx256M -Dgwt.devjar=${gwt_devjar}""/>
+</launchConfiguration>
Added: trunk/eclipse/reference/code-museum/war/DefaultMuseum.html
==============================================================================
--- (empty file)
+++ trunk/eclipse/reference/code-museum/war/DefaultMuseum.html Wed Jun 24
10:15:17 2009
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+ <title>Museum</title>
+ <script language='javascript'
src='defaultmuseum/defaultmuseum.nocache.js'></script>
+ </head>
+
+ <body>
+ <iframe src="javascript:''" id="__gwt_historyFrame"
style="position:absolute;width:0;height:0;border:0"></iframe>
+ </body>
+</html>
Added: trunk/eclipse/reference/code-museum/war/SingleIssue.html
==============================================================================
--- (empty file)
+++ trunk/eclipse/reference/code-museum/war/SingleIssue.html Wed Jun 24
10:15:17 2009
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+ <title>Single issue from Museum</title>
+ <script language='javascript'
src='singleissue/singleissue.nocache.js'></script>
+ </head>
+
+ <body>
+ <iframe src="javascript:''" id="__gwt_historyFrame"
style="position:absolute;width:0;height:0;border:0"></iframe>
+ </body>
+</html>
Added: trunk/eclipse/reference/code-museum/war/WEB-INF/classes/marker
==============================================================================
Added: trunk/eclipse/reference/code-museum/war/WEB-INF/web.xml
==============================================================================
--- (empty file)
+++ trunk/eclipse/reference/code-museum/war/WEB-INF/web.xml Wed Jun 24
10:15:17 2009
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app>
+
+ <!-- Default page to serve -->
+ <welcome-file-list>
+ <welcome-file>DefaultMuseum.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Modified:
trunk/reference/code-museum/src/com/google/gwt/museum/DefaultMuseum.gwt.xml
==============================================================================
---
trunk/reference/code-museum/src/com/google/gwt/museum/DefaultMuseum.gwt.xml
(original)
+++
trunk/reference/code-museum/src/com/google/gwt/museum/DefaultMuseum.gwt.xml
Wed Jun 24 10:15:17 2009
@@ -1,4 +1,4 @@
-<module>
+<module rename-to="defaultmuseum">
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.museum.Museum'/>
Modified:
trunk/reference/code-museum/src/com/google/gwt/museum/Museum.gwt.xml
==============================================================================
--- trunk/reference/code-museum/src/com/google/gwt/museum/Museum.gwt.xml
(original)
+++ trunk/reference/code-museum/src/com/google/gwt/museum/Museum.gwt.xml
Wed Jun 24 10:15:17 2009
@@ -1,4 +1,4 @@
-<module>
+<module rename-to="museum">
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User'/>
Modified:
trunk/reference/code-museum/src/com/google/gwt/museum/SingleIssue.gwt.xml
==============================================================================
---
trunk/reference/code-museum/src/com/google/gwt/museum/SingleIssue.gwt.xml
(original)
+++
trunk/reference/code-museum/src/com/google/gwt/museum/SingleIssue.gwt.xml
Wed Jun 24 10:15:17 2009
@@ -1,4 +1,4 @@
-<module>
+<module rename-to="singleissue">
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User'/>
Modified:
trunk/reference/code-museum/src/com/google/gwt/museum/client/common/AbstractIssue.java
==============================================================================
---
trunk/reference/code-museum/src/com/google/gwt/museum/client/common/AbstractIssue.java
(original)
+++
trunk/reference/code-museum/src/com/google/gwt/museum/client/common/AbstractIssue.java
Wed Jun 24 10:15:17 2009
@@ -16,6 +16,7 @@
package com.google.gwt.museum.client.common;
import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Document;
import com.google.gwt.dom.client.LinkElement;
import com.google.gwt.user.client.Window;
@@ -49,10 +50,11 @@
cssName = "Default";
}
+ String baseUrl = GWT.getModuleBaseURL();
LinkElement issueLinkElement = Document.get().createLinkElement();
issueLinkElement.setRel("stylesheet");
issueLinkElement.setType("text/css");
- issueLinkElement.setHref("issues/" + cssName + ".css");
+ issueLinkElement.setHref(baseUrl + "issues/" + cssName + ".css");
return issueLinkElement;
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
