xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2542 Jetty upgraded

Browse source 
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: e3a259182c [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]
Former-commit-id: 643a150777
This commit is contained in:
Dave Hladky 2013-11-12 10:53:17 -06:00
parent 3480148f14
commit 5313c8b68d
32 changed files with 63 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cots/org.eclipse.jetty/.classpath
View file

@ -1,22 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="javax.el-2.1.0.v201105211819.jar"/>
<classpathentry exported="true" kind="lib" path="javax.servlet.jsp-2.1.0.v201105211820.jar"/>
<classpathentry exported="true" kind="lib" path="org.apache.jasper.glassfish-2.1.0.v201110031002.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-client-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-continuation-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-http-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-io-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-jmx-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-security-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-server-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-servlet-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-servlets-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-util-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-webapp-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="jetty-xml-7.6.9.v20130131.jar"/>
<classpathentry exported="true" kind="lib" path="servlet-api-2.5.jar"/>
<classpathentry exported="true" kind="lib" path="javax.el-2.1.0.v201105211819.jar"/>
<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="jetty-client-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-continuation-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-http-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-io-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-jmx-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-security-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-server-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-servlet-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-servlets-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-util-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-webapp-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="jetty-xml-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="servlet-api-2.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

35
cots/org.eclipse.jetty/META-INF/MANIFEST.MF
View file

@ -4,8 +4,12 @@ Bundle-Name: Eclipse Jetty
Bundle-SymbolicName: org.eclipse.jetty
Bundle-Version: 7.6.9.v20130131
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: javax.servlet,
Export-Package: javax.el,
javax.servlet,
javax.servlet.http,
javax.servlet.jsp,
javax.servlet.jsp.el,
javax.servlet.jsp.tagext,
org.eclipse.jetty.client,
org.eclipse.jetty.client.security,
org.eclipse.jetty.client.webdav,
@ -46,19 +50,18 @@ Export-Package: javax.servlet,
org.eclipse.jetty.util.thread,
org.eclipse.jetty.webapp,
org.eclipse.jetty.xml
Bundle-ClassPath: jetty-client-7.6.9.v20130131.jar,
jetty-continuation-7.6.9.v20130131.jar,
jetty-http-7.6.9.v20130131.jar,
jetty-io-7.6.9.v20130131.jar,
jetty-jmx-7.6.9.v20130131.jar,
jetty-security-7.6.9.v20130131.jar,
jetty-server-7.6.9.v20130131.jar,
jetty-servlet-7.6.9.v20130131.jar,
jetty-servlets-7.6.9.v20130131.jar,
jetty-util-7.6.9.v20130131.jar,
jetty-webapp-7.6.9.v20130131.jar,
jetty-xml-7.6.9.v20130131.jar,
Bundle-ClassPath: jetty-client-7.6.14.v20131031.jar,
jetty-continuation-7.6.14.v20131031.jar,
jetty-http-7.6.14.v20131031.jar,
jetty-io-7.6.14.v20131031.jar,
jetty-jmx-7.6.14.v20131031.jar,
jetty-security-7.6.14.v20131031.jar,
jetty-server-7.6.14.v20131031.jar,
jetty-servlet-7.6.14.v20131031.jar,
jetty-servlets-7.6.14.v20131031.jar,
jetty-util-7.6.14.v20131031.jar,
jetty-webapp-7.6.14.v20131031.jar,
jetty-xml-7.6.14.v20131031.jar,
servlet-api-2.5.jar,
org.apache.jasper.glassfish-2.1.0.v201110031002.jar,
javax.servlet.jsp-2.1.0.v201105211820.jar,
javax.el-2.1.0.v201105211819.jar
javax.el-2.1.0.v201105211819.jar,
javax.servlet.jsp-2.1.0.v201105211820.jar

29
cots/org.eclipse.jetty/build.properties
View file

@ -1,18 +1,17 @@
bin.includes = META-INF/,\
.,\
jetty-client-7.6.9.v20130131.jar,\
jetty-continuation-7.6.9.v20130131.jar,\
jetty-http-7.6.9.v20130131.jar,\
jetty-io-7.6.9.v20130131.jar,\
jetty-jmx-7.6.9.v20130131.jar,\
jetty-security-7.6.9.v20130131.jar,\
jetty-server-7.6.9.v20130131.jar,\
jetty-servlet-7.6.9.v20130131.jar,\
jetty-servlets-7.6.9.v20130131.jar,\
jetty-util-7.6.9.v20130131.jar,\
jetty-webapp-7.6.9.v20130131.jar,\
jetty-xml-7.6.9.v20130131.jar,\
jetty-client-7.6.14.v20131031.jar,\
jetty-continuation-7.6.14.v20131031.jar,\
jetty-http-7.6.14.v20131031.jar,\
jetty-io-7.6.14.v20131031.jar,\
jetty-jmx-7.6.14.v20131031.jar,\
jetty-security-7.6.14.v20131031.jar,\
jetty-server-7.6.14.v20131031.jar,\
jetty-servlet-7.6.14.v20131031.jar,\
jetty-servlets-7.6.14.v20131031.jar,\
jetty-util-7.6.14.v20131031.jar,\
jetty-webapp-7.6.14.v20131031.jar,\
jetty-xml-7.6.14.v20131031.jar,\
servlet-api-2.5.jar,\
org.apache.jasper.glassfish-2.1.0.v201110031002.jar,\
javax.servlet.jsp-2.1.0.v201105211820.jar,\
javax.el-2.1.0.v201105211819.jar
javax.el-2.1.0.v201105211819.jar,\
javax.servlet.jsp-2.1.0.v201105211820.jar

BIN
cots/org.eclipse.jetty/jetty-client-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-client-7.6.9.v20130131.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-continuation-7.6.9.v20130131.jar → cots/org.eclipse.jetty/jetty-continuation-7.6.14.v20131031.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-http-7.6.9.v20130131.jar → cots/org.eclipse.jetty/jetty-http-7.6.14.v20131031.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-io-7.6.9.v20130131.jar → cots/org.eclipse.jetty/jetty-io-7.6.14.v20131031.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-jmx-7.6.9.v20130131.jar → cots/org.eclipse.jetty/jetty-jmx-7.6.14.v20131031.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-security-7.6.9.v20130131.jar → cots/org.eclipse.jetty/jetty-security-7.6.14.v20131031.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-server-7.6.9.v20130131.jar → cots/org.eclipse.jetty/jetty-server-7.6.14.v20131031.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-servlet-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-servlet-7.6.9.v20130131.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-servlets-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-servlets-7.6.9.v20130131.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-util-7.6.9.v20130131.jar → cots/org.eclipse.jetty/jetty-util-7.6.14.v20131031.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-webapp-7.6.9.v20130131.jar → cots/org.eclipse.jetty/jetty-webapp-7.6.14.v20131031.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-xml-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/jetty-xml-7.6.9.v20130131.jar
View file

Binary file not shown.

BIN
cots/org.eclipse.jetty/org.apache.jasper.glassfish-2.1.0.v201110031002.jar
View file

Binary file not shown.

7
edexOsgi/com.raytheon.uf.edex.dataprovideragent.feature/feature.xml
View file

@ -17,9 +17,10 @@
[Enter License Description here.]
</license>
<requires>
<import feature="com.raytheon.uf.edex.datadelivery.core.feature" version="0.0.0"/>
</requires>
<requires>
<import feature="com.raytheon.uf.edex.datadelivery.core.feature" version="0.0.0"/>
<import feature="com.raytheon.uf.common.base.feature" version="0.0.0"/>
</requires>
<plugin
id="com.raytheon.uf.edex.ogc.registry"

9
tests/.classpath
View file

@ -152,5 +152,14 @@
<classpathentry kind="lib" path="lib/org.eclipse.jface_3.8.0.v20120912-135020.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.apache.commons.configuration"/>
<classpathentry kind="src" path="/com.raytheon.uf.edex.datadelivery.retrieval.wfs"/>
<classpathentry kind="lib" path="lib/javax.servlet.source_2.5.0.v200910301333.jar"/>
<classpathentry kind="lib" path="lib/javax.servlet.jsp-2.1.0.v201105211820.jar"/>
<classpathentry kind="lib" path="lib/jetty-http-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-server-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlet-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlets-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-7.6.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/servlet-api-2.5.jar"/>
<classpathentry kind="lib" path="lib/jetty-security-7.6.14.v20131031.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

BIN
tests/lib/javax.servlet.jsp-2.1.0.v201105211820.jar Normal file
View file

Binary file not shown.

BIN
tests/lib/jetty-http-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
tests/lib/jetty-security-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
tests/lib/jetty-server-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
tests/lib/jetty-servlet-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
tests/lib/jetty-servlets-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
tests/lib/jetty-util-7.6.14.v20131031.jar Normal file
View file

Binary file not shown.

BIN
tests/lib/servlet-api-2.5.jar Normal file
View file

Binary file not shown.

4
tests/manual/com/raytheon/uf/common/comm/HttpProxiedValidClientCredentialsTest.java
View file

@ -245,8 +245,8 @@ public class HttpProxiedValidClientCredentialsTest {
private Time getTime() throws ParseException {
String startDateString = "2013-08-30T12:40:00.000";
String endDateString = "2013-08-30T14:15:00.000";
String startDateString = "2013-11-12T18:00:00.000";
String endDateString = "2013-11-12T19:00:00.000";
PointTime time = new PointTime();
time.setFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");

2
tests/manual/com/raytheon/uf/common/comm/HttpProxyTestConstants.java
View file

@ -53,7 +53,7 @@ public class HttpProxyTestConstants extends HttpTestConstants {
public static final String HOST = "dev11";
public static final String REMOTE_HOST = "dev11";
public static final String REMOTE_HOST = "stormy";
public static final int HTTP_PORT = 8085;