Remove last traces of dev/oophm.
Patch by: jat
Review by: amitmanjhi (verbal)
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6411 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/build.xml b/dev/build.xml
index 8c61c74..824fe7a 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -21,9 +21,6 @@
<gwt.javac srcdir="" destdir="${javac.junit.out}">
<src path="core/src" />
<src path="core/test" />
- <src path="oophm/src" />
- <src path="oophm/overlay" />
- <src path="oophm/test" />
<classpath>
<pathelement location="${javac.out}" />
<pathelement location="${alldeps.jar}" />
@@ -184,8 +181,6 @@
<target name="compile" depends="compiler.standalone, build.alldeps.jar" description="Compiles this project">
<gwt.javac srcdir="" excludes="${filter.pattern}">
<src path="core/src" />
- <src path="oophm/src" />
- <src path="oophm/overlay" />
<classpath>
<pathelement location="${alldeps.jar}" />
<pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
@@ -217,9 +212,6 @@
<filename name="org/eclipse/**/*.java" negate="yes" />
<filename name="org/apache/**/*.java" negate="yes" />
</fileset>
- <fileset dir="oophm/src" />
- <fileset dir="oophm/overlay" />
- <fileset dir="oophm/test" />
</gwt.checkstyle>
<gwt.checkstyle>
@@ -235,14 +227,11 @@
<pathelement location="${alldeps.jar}" />
<!-- TODO: the following six items are needed because dev (alone) does
not adhere to the .../{src,super,test} convention, having a split
- between core, oophm, and (historically) the OS platforms. When
+ between core and (historically) oophm and the OS platforms. When
that unifies, these should go away. -->
<pathelement location="${gwt.root}/${project.tail}/core/src" />
<pathelement location="${gwt.root}/${project.tail}/core/super" />
<pathelement location="${gwt.root}/${project.tail}/core/test" />
- <pathelement location="${gwt.root}/${project.tail}/oophm/src" />
- <pathelement location="${gwt.root}/${project.tail}/oophm/overlay" />
- <pathelement location="${gwt.root}/${project.tail}/oophm/test" />
<!-- Pull in gwt-dev and gwt-user sources for .gwt.xml files -->
<pathelement location="${gwt.root}/user/src/" />
<pathelement location="${gwt.root}/user/super/" />
@@ -255,8 +244,6 @@
<mkdir dir="${gwt.build.lib}" />
<outofdate>
<sourcefiles>
- <fileset dir="oophm/src" excludes="**/package.html"/>
- <fileset dir="oophm/overlay" excludes="**/package.html"/>
<fileset dir="core/src">
<exclude name="**/package.html"/>
<exclude name="**/*.properties"/> <!-- copied and/or filtered into bin -->
@@ -273,8 +260,6 @@
</targetfiles>
<sequential>
<gwt.jar>
- <fileset dir="oophm/src" excludes="**/package.html"/>
- <fileset dir="oophm/overlay" excludes="**/package.html"/>
<fileset dir="core/src">
<exclude name="**/package.html"/>
<exclude name="**/*.properties"/> <!-- copied and/or filtered into bin -->
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath
index 5e1f3db..7f6f4e4 100644
--- a/eclipse/dev/.classpath
+++ b/eclipse/dev/.classpath
@@ -2,9 +2,6 @@
<classpath>
<classpathentry kind="src" path="core/src"/>
<classpathentry kind="src" path="core/test"/>
- <classpathentry kind="src" path="oophm/overlay"/>
- <classpathentry kind="src" path="oophm/src"/>
- <classpathentry kind="src" path="oophm/test"/>
<classpathentry excluding="com/google/gwt/dev/jjs/intrinsic/" kind="src" path="core/super"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/ant-1.6.5.jar" sourcepath="/GWT_TOOLS/lib/apache/ant-1.6.5-src.zip"/>
diff --git a/eclipse/dev/.project b/eclipse/dev/.project
index b1ad44e..364f51c 100644
--- a/eclipse/dev/.project
+++ b/eclipse/dev/.project
@@ -20,10 +20,5 @@
<type>2</type>
<locationURI>GWT_ROOT/dev/core</locationURI>
</link>
- <link>
- <name>oophm</name>
- <type>2</type>
- <locationURI>GWT_ROOT/dev/oophm</locationURI>
- </link>
</linkedResources>
</projectDescription>
diff --git a/eclipse/samples/Showcase/Showcase.launch b/eclipse/samples/Showcase/Showcase.launch
index e070869..e9179b1 100644
--- a/eclipse/samples/Showcase/Showcase.launch
+++ b/eclipse/samples/Showcase/Showcase.launch
@@ -1,5 +1,11 @@
<?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="/gwt-dev/core/src/com/google/gwt/dev/HostedMode.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</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"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="Showcase" path="1" type="4"/> "/>
