Rolled back OOPHM support from Launch config and build.xml

svn changeset:6334/svn branch:trunk

diff --git a/build/build.xml b/build/build.xml
index 131f73a56df8d2a4e2c941a90848e87f81a252ce..2af01b88061da7279bf5799ec56ed3c8425c42a9 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -358,15 +358,6 @@
                                </replacetokens>
                        </filterchain>
                </copy>
-               <if> <!-- use oophm for hosted mode in Linux only -->
-                       <equals arg1="${package-platform}" arg2="linux" />
-                       <then> 
-                               <var name="hostedmode-platform" value="oophm" />
-                       </then>
-                       <else>
-                               <var name="hostedmode-platform" value="${hostedmode-platform}" />
-                       </else>
-               </if>
                <copy todir="${output-dir}">
                        <filterchain>
                                <expandproperties />
@@ -380,16 +371,11 @@
                                        <token key="platform-specific-entries" value="&lt;classpathentry kind=&quot;lib&quot; path=&quot;gwt/gwt-dev-${package-platform}.jar&quot; /&gt;" />
                                        <token key="/platform-specific-entries" value="" />
                                </replacetokens>
-                               <!-- .classpath, build-widgetset.xml -->
+                               <!-- .classpath, HostedMode.launch, build-widgetset.xml -->
                                <replacetokens begintoken="&lt;" endtoken=">">
                                        <token key="platform" value="${package-platform}" />
                                        <token key="/platform" value="" />
                                </replacetokens>
-                               <!-- HostedMode.launch -->
-                               <replacetokens begintoken="&lt;" endtoken=">">
-                                       <token key="hostedmode-platform" value="${hostedmode-platform}" />
-                                       <token key="/hostedmode-platform" value="" />
-                               </replacetokens>
                                <!-- .project, *.launch -->
                                <replacetokens begintoken="&lt;" endtoken=">">
                                        <token key="eclipse-workspace-name" value="${eclipse-workspace-name}" />

diff --git a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch b/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch
index a4cb659f4cb481f1a8dfcc0f6785bac4819edeb8..44773b209c07be8c985a85a4bce1471066277005 100644 (file)
--- a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch
+++ b/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/IT Mill Toolkit Hosted Mode.launch"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-<hostedmode-platform></hostedmode-platform>.jar"/>
+<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-<platform></platform>.jar"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -21,7 +21,7 @@
 </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="-noserver -out WebContent/ITMILL/widgetsets http://localhost:8888/"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;1localhost  ^http[:][/][/]localhost[:]8888&quot; -out WebContent/ITMILL/widgetsets http://localhost:8888/"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="<eclipse-launch-vmargs></eclipse-launch-vmargs>"/>
 </launchConfiguration>