Initial Contribution
Signed-off-by: Vinay Vishal <vinay.vishal@oracle.com>
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java
new file mode 100644
index 0000000..f2f2e41
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.*;
+import java.net.*;
+import com.sun.ejte.ccl.reporter.*;
+
+/*
+ * Unit test for 4657979 ("WEB:JSP:JDBC:Server failed to load zip file under
+ * ../WEB-INF/lib directory")
+ */
+public class WebTest {
+
+ private static SimpleReporterAdapter stat
+ = new SimpleReporterAdapter("appserv-tests");
+ private static final String TEST_NAME = "load-classes-from-zip-file";
+ private static final String EXPECTED_RESPONSE = "true";
+
+ private String host;
+ private String port;
+ private String contextRoot;
+
+ public WebTest(String[] args) {
+ host = args[0];
+ port = args[1];
+ contextRoot = args[2];
+ }
+
+ public static void main(String[] args) {
+ stat.addDescription("Unit test for 4657979");
+ WebTest webTest = new WebTest(args);
+ webTest.doTest();
+ stat.printSummary(TEST_NAME);
+ }
+
+ public void doTest() {
+ try {
+ invoke();
+ stat.addStatus(TEST_NAME, stat.PASS);
+ } catch (Exception ex) {
+ System.out.println(TEST_NAME + " test failed");
+ stat.addStatus(TEST_NAME, stat.FAIL);
+ ex.printStackTrace();
+ }
+ }
+
+ private void invoke() throws Exception {
+
+ String url = "http://" + host + ":" + port + contextRoot
+ + "/TestServlet";
+ HttpURLConnection conn = (HttpURLConnection)
+ (new URL(url)).openConnection();
+
+ int code = conn.getResponseCode();
+ if (code != 200) {
+ throw new Exception("Unexpected return code: " + code);
+ }
+
+ InputStream is = null;
+ BufferedReader input = null;
+ try {
+ is = conn.getInputStream();
+ input = new BufferedReader(new InputStreamReader(is));
+ String line = input.readLine();
+ if (!EXPECTED_RESPONSE.equals(line)) {
+ throw new Exception("Wrong response. Expected: " +
+ EXPECTED_RESPONSE + ", received: " + line);
+ }
+ } finally {
+ try {
+ if (is != null) {
+ is.close();
+ }
+ } catch (IOException ioe) {
+ // ignore
+ }
+ try {
+ if (input != null) {
+ input.close();
+ }
+ } catch (IOException ioe) {
+ // ignore
+ }
+ }
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties
new file mode 100644
index 0000000..3f0d02f
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties
@@ -0,0 +1,24 @@
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+
+<property name="module" value="web"/>
+<property name="appname" value="${module}-load-classes-from-zip-file"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="web.xml" value="descriptor/web.xml"/>
+<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml
new file mode 100644
index 0000000..84556b0
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+ &commonSetup;
+ &commonBuild;
+ &testproperties;
+
+ <target name="all" depends="build,deploy,run,undeploy"/>
+
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common"/>
+ </target>
+
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="servlet"/>
+ </antcall>
+ </target>
+
+ <target name="build" depends="compile">
+ <property name="hasWebclient" value="yes"/>
+ <antcall target="webclient-war-common">
+ <param name="hasWebclient" value="yes"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
+ </antcall>
+
+ <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+ includes="WebTest.java"/>
+
+ </target>
+
+ <target name="build-publish-war" depends="build, publish-war-common" />
+
+ <target name="re-deploy" depends="init-common">
+ <antcall target="deploy-war-common"/>
+ </target>
+
+ <target name="deploy" depends="init-common">
+ <antcall target="deploy-war-common"/>
+ </target>
+
+ <target name="run" depends="init-common">
+ <java classname="WebTest">
+ <arg value="${http.host}"/>
+ <arg value="${http.port}"/>
+ <arg value="${contextroot}"/>
+ <classpath>
+ <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+ <pathelement location="."/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common"/>
+ </target>
+
+ <target name="usage">
+ <antcall target="usage-common"/>
+ </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/descriptor/web.xml
new file mode 100644
index 0000000..174dc69
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/descriptor/web.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>TestServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/TestServlet</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
+
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/lib/com/acme/Foo.java b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/lib/com/acme/Foo.java
new file mode 100644
index 0000000..1afe4dc
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/lib/com/acme/Foo.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+public class Foo {
+ // empty
+}
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/lib/foo.zip b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/lib/foo.zip
new file mode 100644
index 0000000..445e75e
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/lib/foo.zip
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/servlet/TestServlet.java
new file mode 100644
index 0000000..ec401d8
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/servlet/TestServlet.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+
+public class TestServlet extends HttpServlet {
+
+ public void doGet(HttpServletRequest req, HttpServletResponse res)
+ throws ServletException, IOException {
+
+ boolean passed = false;
+
+ try {
+ Class foo = this.getClass().getClassLoader().loadClass("com.acme.Foo");
+ if (this.getClass().getClassLoader() == foo.getClassLoader()) {
+ passed = true;
+ }
+ } catch (ClassNotFoundException e) {
+ }
+
+ res.getWriter().print(passed);
+ }
+}
