manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1628199 - in /manifoldcf/branches/CONNECTORS-1050: ./ connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/ connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/ connec...
Date Mon, 29 Sep 2014 14:58:05 GMT
Author: kwright
Date: Mon Sep 29 14:58:04 2014
New Revision: 1628199

URL: http://svn.apache.org/r1628199
Log:
Commit the patch as proposed by Abe-san

Modified:
    manifoldcf/branches/CONNECTORS-1050/build.xml
    manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java
    manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java
    manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java
    manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java
    manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java
    manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml
    manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml
    manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml
    manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml
    manifoldcf/branches/CONNECTORS-1050/framework/build.xml
    manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml
    manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml
    manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml
    manifoldcf/branches/CONNECTORS-1050/framework/core/pom.xml
    manifoldcf/branches/CONNECTORS-1050/framework/crawler-ui/pom.xml
    manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml
    manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
    manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
    manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml
    manifoldcf/branches/CONNECTORS-1050/pom.xml

Modified: manifoldcf/branches/CONNECTORS-1050/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/build.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/build.xml Mon Sep 29 14:58:04 2014
@@ -30,7 +30,7 @@
     <defaultexcludes add="**/.idea/**"/> 
     
     <property name="hsqldb.version" value="2.3.1"/>
-    <property name="jetty.version" value="7.5.4.v20111024"/>
+    <property name="jetty.version" value="9.2.3.v20140905"/>
     <property name="httpclient.version" value="4.3.5"/>
     <property name="httpmime.version" value="4.3.5"/>
     <property name="httpcore.version" value="4.3.2"/>
@@ -949,8 +949,8 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-name" value="jetty-xml"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param
name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
-            <param name="artifact-name" value="jetty-jsp-2.1"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}/toolchain"/><param
name="artifact-version" value="2.3.3"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="jetty-jsp-jdt"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
@@ -1215,9 +1215,9 @@ Use Apache Forrest version forrest-0.9-d
     <target name="download-servlet-api">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
-            <param name="project-path" value="org/mortbay/jetty"/>
-            <param name="artifact-version" value="${servlet-api.version}"/>
-            <param name="artifact-name" value="servlet-api"/>
+            <param name="project-path" value="javax/servlet"/>
+            <param name="artifact-version" value="3.1.0"/>
+            <param name="artifact-name" value="javax.servlet-api"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>

Modified: manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java
(original)
+++ manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java
Mon Sep 29 14:58:04 2014
@@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co
 
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
@@ -27,7 +28,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 import java.io.*;
 import java.util.*;
 
@@ -39,8 +39,10 @@ public class MockRSSService
     
   public MockRSSService(int docsPerFeed)
   {
-    server = new Server(8189);
-    server.setThreadPool(new QueuedThreadPool(35));
+    server = new Server(new QueuedThreadPool(35));
+    ServerConnector connector = new ServerConnector(server);
+    connector.setPort(8189);
+    server.addConnector(connector);
     servlet = new RSSServlet(docsPerFeed);
     ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
     context.setContextPath("/rss");

Modified: manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java
(original)
+++ manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java
Mon Sep 29 14:58:04 2014
@@ -20,6 +20,7 @@ package org.apache.manifoldcf.agents.out
 
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
@@ -27,7 +28,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 import java.io.*;
 import java.util.*;
 
@@ -39,8 +39,10 @@ public class MockSolrService
     
   public MockSolrService()
   {
-    server = new Server(8188);
-    server.setThreadPool(new QueuedThreadPool(35));
+    server = new Server(new QueuedThreadPool(35));
+    ServerConnector connector = new ServerConnector(server);
+    connector.setPort(8188);
+    server.addConnector(connector);
     servlet = new SolrServlet();
     ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
     context.setInitParameter("org.eclipse.jetty.servlet.SessionIdPathParameterName","none");

Modified: manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java
(original)
+++ manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java
Mon Sep 29 14:58:04 2014
@@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co
 
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
@@ -39,8 +40,10 @@ public class MockSessionWebService
     
   public MockSessionWebService(int numContentDocs, String userName, String password)
   {
-    server = new Server(8191);
-    server.setThreadPool(new QueuedThreadPool(100));
+    server = new Server(new QueuedThreadPool(100));
+    ServerConnector connector = new ServerConnector(server);
+    connector.setPort(8191);
+    server.addConnector(connector);
     servlet = new SessionWebServlet(numContentDocs,userName,password);
     ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
     context.setInitParameter("org.eclipse.jetty.servlet.SessionIdPathParameterName","none");

Modified: manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java
(original)
+++ manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java
Mon Sep 29 14:58:04 2014
@@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co
 
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
@@ -27,7 +28,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 import java.io.*;
 import java.util.*;
 
@@ -44,8 +44,10 @@ public class MockWebService
   
   public MockWebService(int docsPerLevel, int maxLevels, boolean generateBadPages)
   {
-    server = new Server(8191);
-    server.setThreadPool(new QueuedThreadPool(100));
+    server = new Server(new QueuedThreadPool(100));
+    ServerConnector connector = new ServerConnector(server);
+    connector.setPort(8191);
+    server.addConnector(connector);
     servlet = new WebServlet(docsPerLevel, maxLevels, generateBadPages);
     ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
     context.setContextPath("/web");

Modified: manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java
(original)
+++ manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java
Mon Sep 29 14:58:04 2014
@@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co
 
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
@@ -38,8 +39,10 @@ public class MockWikiService
     
   public MockWikiService(Class theResourceClass)
   {
-    server = new Server(8089);
-    server.setThreadPool(new QueuedThreadPool(35));
+    server = new Server(new QueuedThreadPool(35));
+    ServerConnector connector = new ServerConnector(server);
+    connector.setPort(8089);
+    server.addConnector(connector);
     servlet = new WikiAPIServlet(theResourceClass);
     ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
     context.setContextPath("/w");

Modified: manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml Mon Sep 29 14:58:04
2014
@@ -54,7 +54,7 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -96,4 +96,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml Mon Sep 29 14:58:04
2014
@@ -54,9 +54,9 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml Mon Sep 29 14:58:04
2014
@@ -54,7 +54,7 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -97,4 +97,4 @@
 
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml Mon Sep 29 14:58:04
2014
@@ -49,9 +49,9 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/build.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/build.xml Mon Sep 29 14:58:04 2014
@@ -63,7 +63,7 @@
             <include name="junit*.jar"/>
             <include name="log4j*.jar"/>
             <include name="serializer*.jar"/>
-            <include name="servlet-api*.jar"/>
+            <include name="javax.servlet-api*.jar"/>
             <include name="juli*.jar"/>
             <include name="xalan*.jar"/>
             <include name="xercesImpl*.jar"/>
@@ -886,7 +886,7 @@
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
-                <include name="servlet-api*.jar"/>
+                <include name="javax.servlet-api*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
@@ -896,7 +896,7 @@
             </fileset>
             <fileset dir="../lib">
                 <include name="jetty*.jar"/>
-                <include name="servlet-api*.jar"/>
+                <include name="javax.servlet-api*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
                 <include name="juli*.jar"/>
@@ -1089,7 +1089,7 @@
             <include name="json*.jar"/>
             <include name="log4j*.jar"/>
             <include name="serializer*.jar"/>
-            <include name="servlet-api*.jar"/>
+            <include name="javax.servlet-api*.jar"/>
             <include name="juli*.jar"/>
             <include name="xalan*.jar"/>
             <include name="xercesImpl*.jar"/>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml Mon Sep 29
14:58:04 2014
@@ -132,7 +132,7 @@
             <include name="junit*.jar"/>
             <include name="log4j*.jar"/>
             <include name="serializer*.jar"/>
-            <include name="servlet-api*.jar"/>
+            <include name="javax.servlet-api*.jar"/>
             <include name="tomcat-juli*.jar"/>
             <include name="xalan*.jar"/>
             <include name="xercesImpl*.jar"/>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml Mon Sep 29 14:58:04
2014
@@ -71,7 +71,7 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -153,4 +153,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml
Mon Sep 29 14:58:04 2014
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-
 <!-- Licensed to the Apache Software Foundation (ASF) under one or more
      contributor license agreements. See the NOTICE file distributed with
      this work for additional information regarding copyright ownership.

Modified: manifoldcf/branches/CONNECTORS-1050/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/core/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/core/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/core/pom.xml Mon Sep 29 14:58:04 2014
@@ -170,6 +170,10 @@
           <groupId>jakarta-regexp</groupId>
           <artifactId>jakarta-regexp</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -228,9 +232,8 @@
 
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/crawler-ui/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/crawler-ui/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/crawler-ui/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/crawler-ui/pom.xml Mon Sep 29 14:58:04 2014
@@ -54,7 +54,7 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -121,4 +121,4 @@
 
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml Mon Sep 29 14:58:04
2014
@@ -205,7 +205,7 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
     </dependency>
     <dependency>
@@ -381,4 +381,4 @@
 		
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
(original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
Mon Sep 29 14:58:04 2014
@@ -18,6 +18,7 @@
 package org.apache.manifoldcf.jettyrunner;
 
 import java.io.*;
+
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.crawler.system.*;
 import org.apache.manifoldcf.crawler.*;
@@ -32,6 +33,7 @@ import javax.servlet.http.HttpServletRes
 
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.server.Connector;
 
@@ -109,7 +111,7 @@ public class ManifoldCFCombinedJettyRunn
   public int getLocalPort()
     throws ManifoldCFException
   {
-    Connector[] conns = server.getConnectors();
+    ServerConnector[] conns = (ServerConnector[]) server.getConnectors();
     if (0 == conns.length) {
       throw new ManifoldCFException("Jetty Server has no Connectors");
     }

Modified: manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
(original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
Mon Sep 29 14:58:04 2014
@@ -18,6 +18,7 @@
 package org.apache.manifoldcf.jettyrunner;
 
 import java.io.*;
+
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.crawler.system.*;
 import org.apache.manifoldcf.crawler.*;
@@ -33,6 +34,7 @@ import javax.servlet.http.HttpServletRes
 
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.server.Connector;
 
@@ -125,7 +127,7 @@ public class ManifoldCFJettyRunner
   public int getLocalPort()
     throws ManifoldCFException
   {
-    Connector[] conns = server.getConnectors();
+    ServerConnector[] conns = (ServerConnector[]) server.getConnectors();
     if (0 == conns.length) {
       throw new ManifoldCFException("Jetty Server has no Connectors");
     }

Modified: manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml Mon Sep 29 14:58:04 2014
@@ -68,6 +68,17 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>    
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>
+
     <!-- other dependencies -->
      <dependency>
         <groupId>commons-lang</groupId>
@@ -90,4 +101,4 @@
       <version>${velocity.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/CONNECTORS-1050/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1050/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1050/pom.xml Mon Sep 29 14:58:04 2014
@@ -41,7 +41,7 @@
     <postgresql.version>9.1-901.jdbc4</postgresql.version>
     <mysql.version>5.1.18</mysql.version>
     <hsqldb.version>2.3.1</hsqldb.version>
-    <jetty.version>7.5.4.v20111024</jetty.version>
+    <jetty.version>9.2.3.v20140905</jetty.version>
     <mail.version>1.4.5</mail.version>
     <activation.version>1.1.1</activation.version>
     <axis.version>1.4</axis.version>
@@ -64,7 +64,7 @@
     <xerces.version>2.10.0</xerces.version>
     <xml-apis.version>1.4.01</xml-apis.version>
     <jtds.version>1.2.4</jtds.version>
-    <servlet-api.version>2.5</servlet-api.version>
+    <servlet-api.version>3.1.0</servlet-api.version>
     <jstl.version>1.2</jstl.version>
     <glassfish.version>2.1.v20091210</glassfish.version>
     <log4j.version>1.2.16</log4j.version>



Mime
View raw message