From 41928e0c5d2a4f8f3600934af491a8eee0c8f768 Mon Sep 17 00:00:00 2001
From: Glyn Normington
Date: Thu, 23 Sep 2010 16:52:50 +0100
Subject: bug 325572: remove dependencies on java.xml.ws
---
build-web-container/copyJavaxToOsgi.sh | 3 +-
build-web-container/dependencies-ivy.xml | 1 -
build-web-container/resources/About.html | 3 -
build.versions | 1 -
.../test/tomcat/TomcatServletContainerTests.java | 74 +++++++++++++---------
.../test/resources/META-INF/test.config.properties | 2 +-
org.eclipse.gemini.web.tomcat/ivy.xml | 1 -
7 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/build-web-container/copyJavaxToOsgi.sh b/build-web-container/copyJavaxToOsgi.sh
index bd53d51..d1f79ed 100755
--- a/build-web-container/copyJavaxToOsgi.sh
+++ b/build-web-container/copyJavaxToOsgi.sh
@@ -12,5 +12,4 @@ cp $SRC/com.springsource.javax.transaction-1.1.0.jar $REPO/com.springsource.java
cp $SRC/com.springsource.javax.xml.bind-2.1.7.jar $REPO/com.springsource.javax.xml.bind/com.springsource.javax.xml.bind-2.1.7.jar
cp $SRC/com.springsource.javax.xml.rpc-1.1.0.jar $REPO/com.springsource.javax.xml.rpc/com.springsource.javax.xml.rpc-1.1.0.jar
cp $SRC/com.springsource.javax.xml.soap-1.3.0.jar $REPO/com.springsource.javax.xml.soap/com.springsource.javax.xml.soap-1.3.0.jar
-cp $SRC/com.springsource.javax.xml.stream-1.0.1.jar $REPO/com.springsource.javax.xml.stream/com.springsource.javax.xml.stream-1.0.1.jar
-cp $SRC/com.springsource.javax.xml.ws-2.1.1.jar $REPO/com.springsource.javax.xml.ws/com.springsource.javax.xml.ws-2.1.1.jar
+cp $SRC/com.springsource.javax.xml.stream-1.0.1.jar $REPO/com.springsource.javax.xml.stream/com.springsource.javax.xml.stream-1.0.1.jar
\ No newline at end of file
diff --git a/build-web-container/dependencies-ivy.xml b/build-web-container/dependencies-ivy.xml
index 6559414..bbb3140 100644
--- a/build-web-container/dependencies-ivy.xml
+++ b/build-web-container/dependencies-ivy.xml
@@ -49,7 +49,6 @@
-
diff --git a/build-web-container/resources/About.html b/build-web-container/resources/About.html
index 48202ca..afff1ec 100644
--- a/build-web-container/resources/About.html
+++ b/build-web-container/resources/About.html
@@ -134,9 +134,6 @@ and such source code may be obtained at http:/
javax.xml.stream 1.0.1 - binary and source is available from the SpringSource Enterprise Bundle Repository (Dual-licensed CDDL or GPL. Virgo elects to use CDDL.)
-
- javax.xml.ws 2.1.1 - binary and source is available from the SpringSource Enterprise Bundle Repository (Dual-licensed CDDL or GPL. Virgo elects to use CDDL.)
-
Eclipse Public License 1.0
diff --git a/build.versions b/build.versions
index 667e29a..6366a84 100644
--- a/build.versions
+++ b/build.versions
@@ -21,7 +21,6 @@ javax.xml.bind=2.1.7
javax.xml.rpc=1.1.0
javax.xml.soap=1.3.0
javax.xml.stream=1.0.1
-javax.xml.ws=2.1.1
org.aopalliance=1.0.0
org.apache.commons.logging=1.1.1
org.apache.felix.configadmin=1.0.10
diff --git a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
index 1eaabd6..acb2338 100644
--- a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
+++ b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
@@ -85,11 +85,11 @@ public class TomcatServletContainerTests {
private static final String LOCATION_WAR_WITH_CONTEXT_XML_CROSS_CONTEXT = LOCATION_PREFIX
+ "../org.eclipse.gemini.web.test/src/test/resources/war-with-context-xml-cross-context.war?Web-ContextPath=/war-with-context-xml-cross-context";
-
+
private BundleContext bundleContext;
private ServletContainer container;
-
+
@BeforeClass
public static void beforeClass() throws Exception {
System.setProperty("org.eclipse.gemini.web.tomcat.config.path", "target/config/tomcat-server.xml");
@@ -191,18 +191,26 @@ public class TomcatServletContainerTests {
String jstlLocation = "file:../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet.jsp.jstl/1.2.0/com.springsource.javax.servlet.jsp.jstl-1.2.0.jar";
Bundle jstlBundle = this.bundleContext.installBundle(jstlLocation);
- Bundle bundle = this.bundleContext.installBundle(LOCATION_WAR_WITH_TLD_FROM_DEPENDENCY);
- bundle.start();
-
- WebApplicationHandle handle = this.container.createWebApplication("/war-with-tld-from-dependency", bundle);
- this.container.startWebApplication(handle);
try {
- String realPath = handle.getServletContext().getRealPath("/");
- System.out.println(realPath);
- validateURL("http://localhost:8080/war-with-tld-from-dependency/test.jsp");
+ Bundle bundle = this.bundleContext.installBundle(LOCATION_WAR_WITH_TLD_FROM_DEPENDENCY);
+
+ try {
+ bundle.start();
+
+ WebApplicationHandle handle = this.container.createWebApplication("/war-with-tld-from-dependency", bundle);
+ this.container.startWebApplication(handle);
+
+ try {
+ String realPath = handle.getServletContext().getRealPath("/");
+ System.out.println(realPath);
+ validateURL("http://localhost:8080/war-with-tld-from-dependency/test.jsp");
+ } finally {
+ this.container.stopWebApplication(handle);
+ }
+ } finally {
+ bundle.uninstall();
+ }
} finally {
- this.container.stopWebApplication(handle);
- bundle.uninstall();
jstlBundle.uninstall();
}
}
@@ -216,16 +224,24 @@ public class TomcatServletContainerTests {
String jstlLocation = "file:" + unzippedJstl.getAbsolutePath();
Bundle jstlBundle = this.bundleContext.installBundle(jstlLocation);
- Bundle bundle = this.bundleContext.installBundle(LOCATION_WAR_WITH_TLD_FROM_DEPENDENCY);
- bundle.start();
-
- WebApplicationHandle handle = this.container.createWebApplication("/war-with-tld-from-dependency", bundle);
- this.container.startWebApplication(handle);
try {
- validateURL("http://localhost:8080/war-with-tld-from-dependency/test.jsp");
+ Bundle bundle = this.bundleContext.installBundle(LOCATION_WAR_WITH_TLD_FROM_DEPENDENCY);
+
+ try {
+ bundle.start();
+
+ WebApplicationHandle handle = this.container.createWebApplication("/war-with-tld-from-dependency", bundle);
+ this.container.startWebApplication(handle);
+
+ try {
+ validateURL("http://localhost:8080/war-with-tld-from-dependency/test.jsp");
+ } finally {
+ this.container.stopWebApplication(handle);
+ }
+ } finally {
+ bundle.uninstall();
+ }
} finally {
- this.container.stopWebApplication(handle);
- bundle.uninstall();
jstlBundle.uninstall();
unzippedJstl.delete(true);
}
@@ -364,8 +380,7 @@ public class TomcatServletContainerTests {
// Copy default context.xml.default
File defaultHostContextXml = new File("target/config/Catalina/localhost/context.xml.default");
String content = ""
- + ""
- + "";
+ + "" + "";
createFileWithContent(defaultHostContextXml, content);
File tomcatServerXml = new File("target/config/tomcat-server.xml");
@@ -382,8 +397,7 @@ public class TomcatServletContainerTests {
WebApplicationHandle handle1 = this.container.createWebApplication("/war-with-context-xml-resources", bundle1);
this.container.startWebApplication(handle1);
- WebApplicationHandle handle2 = this.container.createWebApplication("/war-with-context-xml-cross-context",
- bundle2);
+ WebApplicationHandle handle2 = this.container.createWebApplication("/war-with-context-xml-cross-context", bundle2);
this.container.startWebApplication(handle2);
try {
// tests JNDI resources
@@ -397,7 +411,7 @@ public class TomcatServletContainerTests {
this.container.stopWebApplication(handle2);
bundle2.uninstall();
-
+
defaultContextXml.delete();
defaultHostContextXml.delete();
tomcatServerXml.delete();
@@ -406,14 +420,12 @@ public class TomcatServletContainerTests {
@Test
public void testInstallWebAppDir() throws Exception {
- //Create web app dir
+ // Create web app dir
File webAppDir = new File("target/test-classes/simple-web-app-dir");
File indexJsp = new File(webAppDir, "index.jsp");
- createFileWithContent(
- indexJsp,
- "Hello World!\n" +
- "config.getServletContext().getResourcePaths(/): <%=config.getServletContext().getResourcePaths(\"/\")%>\n" +
- "config.getServletContext().getRealPath(/): <%=config.getServletContext().getRealPath(\"/\")%>");
+ createFileWithContent(indexJsp, "Hello World!\n"
+ + "config.getServletContext().getResourcePaths(/): <%=config.getServletContext().getResourcePaths(\"/\")%>\n"
+ + "config.getServletContext().getRealPath(/): <%=config.getServletContext().getRealPath(\"/\")%>");
Bundle bundle = this.bundleContext.installBundle(LOCATION_PREFIX + webAppDir.getAbsolutePath() + "?Web-ContextPath=/simple-web-app-dir");
bundle.start();
diff --git a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
index ef36a07..23d5acb 100644
--- a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
@@ -14,7 +14,6 @@ file:../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet.jsp/2.
file:../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar@start,\
file:../ivy-cache/repository/javax.xml.rpc/com.springsource.javax.xml.rpc/1.1.0/com.springsource.javax.xml.rpc-1.1.0.jar@start,\
file:../ivy-cache/repository/javax.xml.soap/com.springsource.javax.xml.soap/1.3.0/com.springsource.javax.xml.soap-1.3.0.jar@start,\
-file:../ivy-cache/repository/javax.xml.ws/com.springsource.javax.xml.ws/2.1.1/com.springsource.javax.xml.ws-2.1.1.jar@start,\
file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.ha.springsource-6.0.29.S2-r1559.jar,\
file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.tribes.springsource-6.0.29.S2-r1559.jar,\
file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-6.0.29.S2-r1559.jar@start,\
@@ -23,6 +22,7 @@ file:../ivy-cache/repository/org.apache.el.springsource/com.springsource.org.apa
file:../ivy-cache/repository/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.29.S2-r1559/com.springsource.org.apache.jasper.springsource-6.0.29.S2-r1559.jar,\
file:../ivy-cache/repository/org.eclipse.jdt/com.springsource.org.eclipse.jdt.core.compiler.batch/3.3.0/com.springsource.org.eclipse.jdt.core.compiler.batch-3.3.0.jar,\
file:../ivy-cache/repository/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.29.S2-r1559/com.springsource.org.apache.juli.extras.springsource-6.0.29.S2-r1559.jar@start,\
+file:../ivy-cache/repository/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar,\
file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar@start,\
file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar,\
file:../ivy-cache/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
diff --git a/org.eclipse.gemini.web.tomcat/ivy.xml b/org.eclipse.gemini.web.tomcat/ivy.xml
index 9e00ad6..8dc9e25 100644
--- a/org.eclipse.gemini.web.tomcat/ivy.xml
+++ b/org.eclipse.gemini.web.tomcat/ivy.xml
@@ -32,7 +32,6 @@
-
--
cgit v1.2.3