moved gwt-servlet.jar to gwt.osgi bundle so it can be shared by other server-side bundles at runtime

This commit is contained in:
Axel Uhl
2014-04-07 17:02:00 +02:00
parent 6ded8ffed4
commit 4d6f8c6a54
10 changed files with 8 additions and 375 deletions
-1
View File
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/gwt-dev.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-user.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+3 -365
View File
@@ -5,31 +5,9 @@ Bundle-SymbolicName: com.google.gwt.osgi
Bundle-Version: 2.6.0.qualifier
Bundle-Vendor: GOOGLE
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ClassPath: lib/gwt-dev.jar,
lib/gwt-user.jar,
Bundle-ClassPath: lib/gwt-user.jar,
.
Export-Package: com.gargoylesoftware.htmlunit,
com.gargoylesoftware.htmlunit.attachment,
com.gargoylesoftware.htmlunit.gae,
com.gargoylesoftware.htmlunit.html,
com.gargoylesoftware.htmlunit.html.applets,
com.gargoylesoftware.htmlunit.html.impl,
com.gargoylesoftware.htmlunit.html.xpath,
com.gargoylesoftware.htmlunit.javascript,
com.gargoylesoftware.htmlunit.javascript.background,
com.gargoylesoftware.htmlunit.javascript.configuration,
com.gargoylesoftware.htmlunit.javascript.host,
com.gargoylesoftware.htmlunit.javascript.host.canvas,
com.gargoylesoftware.htmlunit.javascript.host.css,
com.gargoylesoftware.htmlunit.javascript.host.html,
com.gargoylesoftware.htmlunit.javascript.host.xml,
com.gargoylesoftware.htmlunit.javascript.regexp,
com.gargoylesoftware.htmlunit.protocol.about,
com.gargoylesoftware.htmlunit.protocol.data,
com.gargoylesoftware.htmlunit.protocol.javascript,
com.gargoylesoftware.htmlunit.util,
com.gargoylesoftware.htmlunit.xml,
com.google.gwt.activity.shared,
Export-Package: com.google.gwt.activity.shared,
com.google.gwt.animation.client,
com.google.gwt.animation.client.testing,
com.google.gwt.aria.client,
@@ -43,65 +21,9 @@ Export-Package: com.gargoylesoftware.htmlunit,
com.google.gwt.core.client.impl,
com.google.gwt.core.client.prefetch,
com.google.gwt.core.client.testing,
com.google.gwt.core.ext,
com.google.gwt.core.ext.debug,
com.google.gwt.core.ext.linker,
com.google.gwt.core.ext.linker.impl,
com.google.gwt.core.ext.soyc,
com.google.gwt.core.ext.soyc.impl,
com.google.gwt.core.ext.typeinfo,
com.google.gwt.core.linker,
com.google.gwt.core.server,
com.google.gwt.core.shared,
com.google.gwt.debug.client,
com.google.gwt.dev,
com.google.gwt.dev.asm,
com.google.gwt.dev.asm.commons,
com.google.gwt.dev.asm.signature,
com.google.gwt.dev.asm.tree,
com.google.gwt.dev.asm.util,
com.google.gwt.dev.cfg,
com.google.gwt.dev.generator,
com.google.gwt.dev.generator.ast,
com.google.gwt.dev.javac,
com.google.gwt.dev.javac.asm,
com.google.gwt.dev.javac.testing,
com.google.gwt.dev.javac.testing.impl,
com.google.gwt.dev.javac.typemodel,
com.google.gwt.dev.jdt,
com.google.gwt.dev.jjs,
com.google.gwt.dev.jjs.ast,
com.google.gwt.dev.jjs.ast.js,
com.google.gwt.dev.jjs.impl,
com.google.gwt.dev.jjs.impl.gflow,
com.google.gwt.dev.jjs.impl.gflow.cfg,
com.google.gwt.dev.jjs.impl.gflow.constants,
com.google.gwt.dev.jjs.impl.gflow.copy,
com.google.gwt.dev.jjs.impl.gflow.liveness,
com.google.gwt.dev.jjs.impl.gflow.unreachable,
com.google.gwt.dev.js,
com.google.gwt.dev.js.ast,
com.google.gwt.dev.js.rhino,
com.google.gwt.dev.json,
com.google.gwt.dev.protobuf,
com.google.gwt.dev.resource,
com.google.gwt.dev.resource.impl,
com.google.gwt.dev.shell,
com.google.gwt.dev.shell.ie,
com.google.gwt.dev.shell.jetty,
com.google.gwt.dev.shell.log,
com.google.gwt.dev.shell.remoteui,
com.google.gwt.dev.shell.rewrite,
com.google.gwt.dev.ui,
com.google.gwt.dev.util,
com.google.gwt.dev.util.arg,
com.google.gwt.dev.util.collect,
com.google.gwt.dev.util.editdistance,
com.google.gwt.dev.util.log,
com.google.gwt.dev.util.log.dashboard,
com.google.gwt.dev.util.log.speedtracer,
com.google.gwt.dev.util.msg,
com.google.gwt.dev.util.xml,
com.google.gwt.dom.builder.client,
com.google.gwt.dom.builder.shared,
com.google.gwt.dom.client,
@@ -146,7 +68,6 @@ Export-Package: com.gargoylesoftware.htmlunit,
com.google.gwt.junit.remote,
com.google.gwt.junit.server,
com.google.gwt.junit.tools,
com.google.gwt.lang,
com.google.gwt.layout.client,
com.google.gwt.logging.client,
com.google.gwt.logging.impl,
@@ -176,32 +97,10 @@ Export-Package: com.gargoylesoftware.htmlunit,
com.google.gwt.safehtml.client,
com.google.gwt.safehtml.rebind,
com.google.gwt.safehtml.shared,
com.google.gwt.soyc,
com.google.gwt.soyc.io,
com.google.gwt.storage.client,
com.google.gwt.text.client,
com.google.gwt.text.shared,
com.google.gwt.text.shared.testing,
com.google.gwt.thirdparty.debugging.sourcemap,
com.google.gwt.thirdparty.debugging.sourcemap.proto,
com.google.gwt.thirdparty.guava.common.annotations,
com.google.gwt.thirdparty.guava.common.base,
com.google.gwt.thirdparty.guava.common.base.internal,
com.google.gwt.thirdparty.guava.common.cache,
com.google.gwt.thirdparty.guava.common.collect,
com.google.gwt.thirdparty.guava.common.eventbus,
com.google.gwt.thirdparty.guava.common.io,
com.google.gwt.thirdparty.guava.common.net,
com.google.gwt.thirdparty.guava.common.primitives,
com.google.gwt.thirdparty.guava.common.util.concurrent,
com.google.gwt.thirdparty.javascript.jscomp,
com.google.gwt.thirdparty.javascript.jscomp.ant,
com.google.gwt.thirdparty.javascript.jscomp.deps,
com.google.gwt.thirdparty.javascript.jscomp.graph,
com.google.gwt.thirdparty.javascript.jscomp.parsing,
com.google.gwt.thirdparty.javascript.jscomp.regex,
com.google.gwt.thirdparty.javascript.rhino,
com.google.gwt.thirdparty.javascript.rhino.jstype,
com.google.gwt.thirdparty.streamhtmlparser,
com.google.gwt.thirdparty.streamhtmlparser.impl,
com.google.gwt.thirdparty.streamhtmlparser.util,
@@ -242,10 +141,7 @@ Export-Package: com.gargoylesoftware.htmlunit,
com.google.gwt.user.tools.util,
com.google.gwt.useragent.client,
com.google.gwt.useragent.rebind,
com.google.gwt.util,
com.google.gwt.util.regexfilter,
com.google.gwt.util.tools,
com.google.gwt.util.tools.shared,
com.google.gwt.validation.client,
com.google.gwt.validation.client.constraints,
com.google.gwt.validation.client.impl,
@@ -284,266 +180,8 @@ Export-Package: com.gargoylesoftware.htmlunit,
com.google.web.bindery.requestfactory.vm,
com.google.web.bindery.requestfactory.vm.impl,
com.google.web.bindery.requestfactory.vm.testing,
com.ibm.icu.impl,
com.ibm.icu.impl.data,
com.ibm.icu.impl.duration,
com.ibm.icu.impl.duration.impl,
com.ibm.icu.impl.locale,
com.ibm.icu.lang,
com.ibm.icu.math,
com.ibm.icu.text,
com.ibm.icu.util,
com.steadystate.css.dom,
com.steadystate.css.parser,
com.steadystate.css.parser.selectors,
com.steadystate.css.sac,
com.steadystate.css.userdata,
java_cup,
java_cup.anttask,
java_cup.runtime,
net.sourceforge.htmlunit.corejs.classfile,
net.sourceforge.htmlunit.corejs.javascript,
net.sourceforge.htmlunit.corejs.javascript.annotations,
net.sourceforge.htmlunit.corejs.javascript.ast,
net.sourceforge.htmlunit.corejs.javascript.debug,
net.sourceforge.htmlunit.corejs.javascript.jdk13,
net.sourceforge.htmlunit.corejs.javascript.jdk15,
net.sourceforge.htmlunit.corejs.javascript.json,
net.sourceforge.htmlunit.corejs.javascript.optimizer,
net.sourceforge.htmlunit.corejs.javascript.regexp,
net.sourceforge.htmlunit.corejs.javascript.serialize,
net.sourceforge.htmlunit.corejs.javascript.tools,
net.sourceforge.htmlunit.corejs.javascript.tools.debugger,
net.sourceforge.htmlunit.corejs.javascript.tools.debugger.treetable,
net.sourceforge.htmlunit.corejs.javascript.tools.shell,
net.sourceforge.htmlunit.corejs.javascript.xml,
org.apache.bcel,
org.apache.bcel.classfile,
org.apache.bcel.generic,
org.apache.bcel.util,
org.apache.bcel.verifier,
org.apache.bcel.verifier.exc,
org.apache.bcel.verifier.statics,
org.apache.bcel.verifier.structurals,
org.apache.commons.codec,
org.apache.commons.codec.binary,
org.apache.commons.codec.digest,
org.apache.commons.codec.language,
org.apache.commons.codec.net,
org.apache.commons.collections,
org.apache.commons.collections.bag,
org.apache.commons.collections.bidimap,
org.apache.commons.collections.buffer,
org.apache.commons.collections.collection,
org.apache.commons.collections.comparators,
org.apache.commons.collections.functors,
org.apache.commons.collections.iterators,
org.apache.commons.collections.keyvalue,
org.apache.commons.collections.list,
org.apache.commons.collections.map,
org.apache.commons.collections.set,
org.apache.commons.el,
org.apache.commons.el.parser,
org.apache.commons.io,
org.apache.commons.io.comparator,
org.apache.commons.io.filefilter,
org.apache.commons.io.input,
org.apache.commons.io.output,
org.apache.commons.logging,
org.apache.commons.logging.impl,
org.apache.html.dom,
org.apache.http,
org.apache.http.annotation,
org.apache.http.auth,
org.apache.http.auth.params,
org.apache.http.client,
org.apache.http.client.entity,
org.apache.http.client.methods,
org.apache.http.client.params,
org.apache.http.client.protocol,
org.apache.http.client.utils,
org.apache.http.conn,
org.apache.http.conn.params,
org.apache.http.conn.routing,
org.apache.http.conn.scheme,
org.apache.http.conn.ssl,
org.apache.http.conn.util,
org.apache.http.cookie,
org.apache.http.cookie.params,
org.apache.http.entity,
org.apache.http.entity.mime,
org.apache.http.entity.mime.content,
org.apache.http.impl,
org.apache.http.impl.auth,
org.apache.http.impl.client,
org.apache.http.impl.conn,
org.apache.http.impl.conn.tsccm,
org.apache.http.impl.cookie,
org.apache.http.impl.entity,
org.apache.http.impl.io,
org.apache.http.io,
org.apache.http.message,
org.apache.http.params,
org.apache.http.protocol,
org.apache.http.util,
org.apache.james.mime4j,
org.apache.james.mime4j.codec,
org.apache.james.mime4j.descriptor,
org.apache.james.mime4j.field,
org.apache.james.mime4j.field.address,
org.apache.james.mime4j.field.address.parser,
org.apache.james.mime4j.field.contentdisposition.parser,
org.apache.james.mime4j.field.contenttype.parser,
org.apache.james.mime4j.field.datetime,
org.apache.james.mime4j.field.datetime.parser,
org.apache.james.mime4j.field.language.parser,
org.apache.james.mime4j.field.mimeversion.parser,
org.apache.james.mime4j.field.structured.parser,
org.apache.james.mime4j.io,
org.apache.james.mime4j.message,
org.apache.james.mime4j.parser,
org.apache.james.mime4j.storage,
org.apache.james.mime4j.util,
org.apache.jasper,
org.apache.jasper.compiler,
org.apache.jasper.compiler.tagplugin,
org.apache.jasper.runtime,
org.apache.jasper.security,
org.apache.jasper.servlet,
org.apache.jasper.tagplugins.jstl,
org.apache.jasper.util,
org.apache.jasper.xmlparser,
org.apache.regexp,
org.apache.tapestry.util.text,
org.apache.tools.ant,
org.apache.tools.ant.filters,
org.apache.tools.ant.filters.util,
org.apache.tools.ant.helper,
org.apache.tools.ant.input,
org.apache.tools.ant.listener,
org.apache.tools.ant.loader,
org.apache.tools.ant.taskdefs,
org.apache.tools.ant.taskdefs.compilers,
org.apache.tools.ant.taskdefs.condition,
org.apache.tools.ant.taskdefs.cvslib,
org.apache.tools.ant.taskdefs.email,
org.apache.tools.ant.taskdefs.rmic,
org.apache.tools.ant.types,
org.apache.tools.ant.types.mappers,
org.apache.tools.ant.types.resolver,
org.apache.tools.ant.types.selectors,
org.apache.tools.ant.types.selectors.modifiedselector,
org.apache.tools.ant.util,
org.apache.tools.ant.util.facade,
org.apache.tools.ant.util.regexp,
org.apache.tools.bzip2,
org.apache.tools.mail,
org.apache.tools.tar,
org.apache.tools.zip,
org.apache.wml,
org.apache.wml.dom,
org.apache.xalan,
org.apache.xalan.client,
org.apache.xalan.extensions,
org.apache.xalan.lib,
org.apache.xalan.lib.sql,
org.apache.xalan.processor,
org.apache.xalan.res,
org.apache.xalan.serialize,
org.apache.xalan.templates,
org.apache.xalan.trace,
org.apache.xalan.transformer,
org.apache.xalan.xslt,
org.apache.xalan.xsltc,
org.apache.xalan.xsltc.cmdline,
org.apache.xalan.xsltc.cmdline.getopt,
org.apache.xalan.xsltc.compiler,
org.apache.xalan.xsltc.compiler.util,
org.apache.xalan.xsltc.dom,
org.apache.xalan.xsltc.runtime,
org.apache.xalan.xsltc.runtime.output,
org.apache.xalan.xsltc.trax,
org.apache.xalan.xsltc.util,
org.apache.xerces.dom,
org.apache.xerces.dom.events,
org.apache.xerces.dom3.as,
org.apache.xerces.impl,
org.apache.xerces.impl.dtd,
org.apache.xerces.impl.dtd.models,
org.apache.xerces.impl.dv,
org.apache.xerces.impl.dv.dtd,
org.apache.xerces.impl.dv.util,
org.apache.xerces.impl.dv.xs,
org.apache.xerces.impl.io,
org.apache.xerces.impl.msg,
org.apache.xerces.impl.validation,
org.apache.xerces.impl.xpath,
org.apache.xerces.impl.xpath.regex,
org.apache.xerces.impl.xs,
org.apache.xerces.impl.xs.identity,
org.apache.xerces.impl.xs.models,
org.apache.xerces.impl.xs.opti,
org.apache.xerces.impl.xs.traversers,
org.apache.xerces.impl.xs.util,
org.apache.xerces.jaxp,
org.apache.xerces.jaxp.datatype,
org.apache.xerces.jaxp.validation,
org.apache.xerces.parsers,
org.apache.xerces.util,
org.apache.xerces.xinclude,
org.apache.xerces.xni,
org.apache.xerces.xni.grammars,
org.apache.xerces.xni.parser,
org.apache.xerces.xpointer,
org.apache.xerces.xs,
org.apache.xerces.xs.datatypes,
org.apache.xml.dtm,
org.apache.xml.dtm.ref,
org.apache.xml.dtm.ref.dom2dtm,
org.apache.xml.dtm.ref.sax2dtm,
org.apache.xml.res,
org.apache.xml.serialize,
org.apache.xml.serializer,
org.apache.xml.serializer.dom3,
org.apache.xml.serializer.utils,
org.apache.xml.utils,
org.apache.xml.utils.res,
org.apache.xmlcommons,
org.apache.xpath,
org.apache.xpath.axes,
org.apache.xpath.compiler,
org.apache.xpath.domapi,
org.apache.xpath.functions,
org.apache.xpath.jaxp,
org.apache.xpath.objects,
org.apache.xpath.operations,
org.apache.xpath.patterns,
org.apache.xpath.res,
org.cyberneko.html,
org.cyberneko.html.filters,
org.cyberneko.html.parsers,
org.cyberneko.html.xercesbridge,
org.eclipse.jdt.core,
org.eclipse.jdt.core.compiler,
org.eclipse.jdt.core.compiler.batch,
org.eclipse.jdt.internal.antadapter,
org.eclipse.jdt.internal.compiler,
org.eclipse.jdt.internal.compiler.ast,
org.eclipse.jdt.internal.compiler.batch,
org.eclipse.jdt.internal.compiler.classfmt,
org.eclipse.jdt.internal.compiler.codegen,
org.eclipse.jdt.internal.compiler.env,
org.eclipse.jdt.internal.compiler.flow,
org.eclipse.jdt.internal.compiler.impl,
org.eclipse.jdt.internal.compiler.lookup,
org.eclipse.jdt.internal.compiler.parser,
org.eclipse.jdt.internal.compiler.parser.diagnose,
org.eclipse.jdt.internal.compiler.problem,
org.eclipse.jdt.internal.compiler.util,
org.eclipse.jdt.internal.core.util,
org.hibernate.validator,
org.hibernate.validator.engine,
org.jdesktop.swingworker
org.hibernate.validator.engine
Require-Bundle: javax.validation;bundle-version="1.0.0"
Import-Package: javax.servlet;version="2.6.0",
javax.servlet.http;version="2.6.0"
@@ -1,4 +1,3 @@
bin.includes = META-INF/,\
.,\
lib/gwt-dev.jar,\
lib/gwt-user.jar
Binary file not shown.
@@ -30,4 +30,3 @@ Require-Bundle: com.googlecode.java-diff-utils;bundle-version="1.3.0",
com.sap.sailing.domain.common,
org.json.simple;bundle-version="1.1.0",
com.sap.sailing.geocoding
Import-Package: org.apache.commons.collections.map
+3 -4
View File
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry excluding="com/sap/sailing/gwt/ui/jre/" kind="src" path="src/main/java"/>
<classpathentry kind="lib" path="WEB-INF/lib/gwt-servlet.jar" sourcepath="/com.google.gwt.osgi/lib/gwt-user.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/gwt-maps-api-3.9.0-build-17.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/gwt-ajaxloader.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/gwt-bootstrap-2.3.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/classes/"/>
<classpathentry kind="output" path="bin"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/classes/"/>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -40,13 +40,13 @@ Import-Package: javax.jms;version="1.1.0",
javax.servlet;version="2.6.0",
javax.servlet.descriptor;version="2.6.0",
javax.servlet.http;version="2.6.0",
org.apache.http.client;version="4.2.5",
org.json.simple,
org.json.simple.parser,
org.osgi.framework,
org.osgi.util.tracker
Web-ContextPath: /gwt
Bundle-ClassPath: WEB-INF/classes/,
WEB-INF/lib/gwt-servlet.jar,
WEB-INF/lib/gwt-maps-api-3.9.0-build-17.jar,
WEB-INF/lib/gwt-ajaxloader.jar,
WEB-INF/lib/gwt-bootstrap-2.3.2.0.jar
@@ -2,7 +2,6 @@ source.WEB-INF/classes/ = src/main/java,\
src/main/resources
output.WEB-INF/classes/ = bin
bin.includes = META-INF/,\
WEB-INF/lib/gwt-servlet.jar,\
WEB-INF/classes/,\
WEB-INF/web.xml,\
AdminConsole.css,\
@@ -17,11 +17,11 @@ import com.google.gwt.maps.client.base.LatLng;
import com.google.gwt.maps.client.base.Point;
import com.sap.sailing.domain.common.dto.PositionDTO;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
import com.sap.sailing.gwt.ui.client.Timer;
import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO;
import com.sap.sailing.gwt.ui.shared.WindFieldDTO;
import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay;
import com.sap.sailing.gwt.ui.simulator.util.ToolTip;
import com.sap.sse.gwt.client.player.Timer;
/**
* A google map overlay based on a HTML5 canvas for drawing a wind field. The overlay covers the whole map and displays