tuned build.properties and pom.xml such that GWT compiler output from mvn build is packaged in JAR

This commit is contained in:
Axel Uhl
2011-08-22 14:52:24 +02:00
parent ea49ed8efc
commit 81ab8cee63
19 changed files with 57 additions and 32 deletions
+9 -1
View File
@@ -1,4 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="war/WEB-INF/classes/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/gwt-maps.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/gwt-servlet.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/gwt-visualization.jar"/>
<classpathentry kind="output" path="war/WEB-INF/classes"/>
</classpath>
@@ -19,8 +19,7 @@ Require-Bundle: javax.servlet;bundle-version="2.5.0",
com.sap.ui.phoenix.pwt-sap.ui.commons,
com.sap.ui.phoenix.pwt-sap.ui.core,
com.sap.ui.phoenix.commons,
com.sap.ui.phoenix.core,
com.sap.ui.phoenix.resource
com.sap.ui.phoenix.core
Bundle-ClassPath: lib/resource-0.18.0-20110822.000513-32.jar,
lib/gwt-visualization.jar,
lib/gwt-maps.jar,
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="com.google.gdt.eclipse.suite.webapp">
<booleanAttribute key="com.google.gdt.eclipse.core.RUN_SERVER" value="false"/>
<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.GWTShell"/>
<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.DevMode"/>
<booleanAttribute key="com.google.gdt.eclipse.suiteWarArgumentProcessor.IS_WAR_FROM_PROJECT_PROPERTIES" value="true"/>
<booleanAttribute key="com.google.gwt.eclipse.core.CODE_SERVER_PORT_AUTO" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -11,8 +11,8 @@
<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort auto"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war C:\data\SAP\sailing\workspace\java\com.sap.sailing.gwt.ui\war -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort auto com.sap.sailing.gwt.ui.AdminConsole"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.gwt.ui"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
</launchConfiguration>
+4 -2
View File
@@ -10,5 +10,7 @@ bin.includes = META-INF/,\
lib/commons-0.18.0-20110822.000513-32.jar,\
lib/core-0.18.0-20110822.000513-32.jar,\
lib/resource-0.18.0-20110822.000513-32.jar,\
war/WEB-INF/classes/,\
lib/gwt-maps.jar
lib/gwt-maps.jar,\
bin/com.sap.sailing.gwt.ui-1.0.0-SNAPSHOT/
bin.excludes = war/com.sap.sailing.gwt.ui.AdminConsole/,\
war/WEB-INF/deploy/
-11
View File
@@ -9,17 +9,6 @@
load-on-startup="true">
</servlet>
</extension>
<extension
point="org.eclipse.equinox.http.registry.servlets">
<servlet
alias="/resources"
class="com.sap.phx.resource.ResourceServlet"
load-on-startup="true">
<init-param
name=".sap.phx.resource.DEV_MODE" value="true">
</init-param>
</servlet>
</extension>
<extension
point="org.eclipse.equinox.http.registry.resources">
<resource
-5
View File
@@ -44,11 +44,6 @@
<artifactId>commons</artifactId>
<version>0.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sap.ui.phoenix</groupId>
<artifactId>resource</artifactId>
<version>0.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.gwt.google-apis</groupId>
<artifactId>gwt-maps</artifactId>
@@ -34,7 +34,6 @@ import com.google.gwt.maps.client.overlay.Marker;
import com.google.gwt.maps.client.overlay.MarkerOptions;
import com.google.gwt.maps.client.overlay.Polyline;
import com.google.gwt.maps.client.overlay.PolylineOptions;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.FormPanel;
import com.google.gwt.user.client.ui.Grid;
@@ -175,8 +174,6 @@ public class RaceMapPanel extends FormPanel implements EventDisplayer, TimeListe
}
private void loadMapsAPI() {
String host = Window.Location.getHost();
errorReporter.reportError("Host is "+host);
Maps.loadMapsApi(mapsAPIKey, "2", false, new Runnable() {
public void run() {
map = new MapWidget();
@@ -24,5 +24,5 @@
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<stringAttribute key="workspace_bundles" value="com.google.gwt.osgi@default:default,com.googlecode.java-diff-utils.test@default:default,com.googlecode.java-diff-utils@default:default,com.mongodb.driver@default:default,com.sap.sailing.declination.test@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.test@default:default,com.sap.sailing.domain.tractracadapter@default:default,com.sap.sailing.domain@default:default,com.sap.sailing.expeditionconnector.test@default:default,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.gwt.ui@default:default,com.sap.sailing.mongodb.test@default:default,com.sap.sailing.mongodb@default:default,com.sap.sailing.server.test@default:default,com.sap.sailing.server@default:default,com.tractrac.clientmodule@default:default,com.tractrac.resultapi@default:default,org.json.simple@default:default"/>
<stringAttribute key="workspace_bundles" value="com.google.gwt.osgi@default:default,com.googlecode.java-diff-utils.test@default:default,com.googlecode.java-diff-utils@default:default,com.mongodb.driver@default:default,com.sap.sailing.declination.test@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.test@default:default,com.sap.sailing.domain.tractracadapter@default:default,com.sap.sailing.domain@default:default,com.sap.sailing.expeditionconnector.test@default:default,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.gwt.ui@default:default,com.sap.sailing.mongodb.test@default:default,com.sap.sailing.mongodb@default:default,com.sap.sailing.server.test@default:default,com.sap.sailing.server@default:default,com.sap.ui.phoenix.resource-osgi@default:false,com.tractrac.clientmodule@default:default,com.tractrac.resultapi@default:default,org.json.simple@default:default"/>
</launchConfiguration>
@@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Fragment-Host: com.sap.ui.phoenix.resource
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.osgi;bundle-version="3.7.0",
javax.servlet;bundle-version="2.5.0",
com.sap.sailing.gwt.ui;bundle-version="1.0.0"
Require-Bundle: org.eclipse.osgi,
javax.servlet,
com.sap.sailing.gwt.ui
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
.,\
fragment.xml
+13
View File
@@ -0,0 +1,13 @@
<fragment>
<extension
point="org.eclipse.equinox.http.registry.servlets">
<servlet
alias="/resources"
class="com.sap.phx.resource.ResourceServlet"
load-on-startup="true">
<init-param
name="com.sap.phx.resource.DEV_MODE" value="true">
</init-param>
</servlet>
</extension>
</fragment>
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>root</artifactId>
<groupId>com.sap.sailing</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>com.sap.ui.phoenix.resource-osgi</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
<dependency>
<groupId>com.sap.ui.phoenix</groupId>
<artifactId>resource</artifactId>
<version>0.18.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
+1
View File
@@ -33,6 +33,7 @@
<module>com.mongodb.driver</module>
<module>com.googlecode.java-diff-utils</module>
<module>com.googlecode.java-diff-utils.test</module>
<module>com.sap.ui.phoenix.resource-osgi</module>
</modules>
<properties>