manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1595708 - in /manifoldcf/branches/CONNECTORS-938: ./ framework/ framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/
Date Sun, 18 May 2014 23:56:13 GMT
Author: kwright
Date: Sun May 18 23:56:13 2014
New Revision: 1595708

URL: http://svn.apache.org/r1595708
Log:
Port to jetty 9.2.0 m1

Modified:
    manifoldcf/branches/CONNECTORS-938/build.xml
    manifoldcf/branches/CONNECTORS-938/framework/build.xml
    manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
    manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java

Modified: manifoldcf/branches/CONNECTORS-938/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-938/build.xml?rev=1595708&r1=1595707&r2=1595708&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-938/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-938/build.xml Sun May 18 23:56:13 2014
@@ -943,7 +943,7 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-jetty">
         <mkdir dir="lib"/>
-        <property name="jetty-version" value="7.5.4.v20111024"/>
+        <property name="jetty-version" value="9.2.0.M1"/>
         <property name="jetty-package" value="org/eclipse/jetty"/>
         <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-jndi"/>
@@ -990,7 +990,7 @@ Use Apache Forrest version forrest-0.9-d
             <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"/>
+            <param name="artifact-name" value="jetty-jsp"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
@@ -1265,9 +1265,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="2.5-20081211"/>
-            <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-938/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-938/framework/build.xml?rev=1595708&r1=1595707&r2=1595708&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-938/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-938/framework/build.xml Sun May 18 23:56:13 2014
@@ -61,7 +61,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"/>
@@ -864,7 +864,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"/>
@@ -874,7 +874,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"/>
@@ -1032,13 +1032,13 @@
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="log4j.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="slf4j-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="slf4j-simple.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="servlet-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
+        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="javax.servlet-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="ecj.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="jetty-continuation.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="jetty-http.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="jetty-io.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="jetty-jndi.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="jetty-jsp-2.1.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
+        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="jetty-jsp.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="jetty-plus.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="jetty-security.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="jetty-server.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
@@ -1074,13 +1074,13 @@
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="log4j.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="slf4j-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="slf4j-simple.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="servlet-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
+        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="javax.servlet-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="ecj.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="jetty-continuation.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="jetty-http.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="jetty-io.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="jetty-jndi.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="jetty-jsp-2.1.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
+        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="jetty-jsp.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="jetty-plus.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="jetty-security.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="jetty-server.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
@@ -1123,7 +1123,7 @@
         <antcall target="general-add-lib-classpath"><param name="lib-jar" value="commons-logging.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-add-lib-classpath"><param name="lib-jar" value="log4j.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-add-lib-classpath"><param name="lib-jar" value="serializer.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="servlet-api.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
+        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="javax.servlet-api.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-add-lib-classpath"><param name="lib-jar" value="xalan.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-add-lib-classpath"><param name="lib-jar" value="xercesImpl.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
         <antcall target="general-add-lib-classpath"><param name="lib-jar" value="xml-apis.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
@@ -1369,7 +1369,7 @@
         <property name="manifest-cp-39" value="${manifest-cp-38} ../lib/log4j.jar"/>
         <property name="manifest-cp-40" value="${manifest-cp-39} ../lib/postgresql.jar"/>
         <property name="manifest-cp-42" value="${manifest-cp-40} ../lib/serializer.jar"/>
-        <property name="manifest-cp-43" value="${manifest-cp-42} ../lib/servlet-api.jar"/>
+        <property name="manifest-cp-43" value="${manifest-cp-42} ../lib/javax.servlet-api.jar"/>
         <property name="manifest-cp-44" value="${manifest-cp-43} ../lib/juli.jar"/>
         <property name="manifest-cp-45" value="${manifest-cp-44} ../lib/xalan.jar"/>
         <property name="manifest-cp-46" value="${manifest-cp-45} ../lib/xercesImpl.jar"/>
@@ -1471,7 +1471,7 @@
         <property name="manifest-cp-proprietary-40" value="${manifest-cp-proprietary-39}
../lib/postgresql.jar"/>
         <property name="manifest-cp-proprietary-41" value="${manifest-cp-proprietary-40}
../lib-proprietary/mysql-connector-java.jar"/>
         <property name="manifest-cp-proprietary-42" value="${manifest-cp-proprietary-41}
../lib/serializer.jar"/>
-        <property name="manifest-cp-proprietary-43" value="${manifest-cp-proprietary-42}
../lib/servlet-api.jar"/>
+        <property name="manifest-cp-proprietary-43" value="${manifest-cp-proprietary-42}
../lib/javax.servlet-api.jar"/>
         <property name="manifest-cp-proprietary-44" value="${manifest-cp-proprietary-43}
../lib/juli.jar"/>
         <property name="manifest-cp-proprietary-45" value="${manifest-cp-proprietary-44}
../lib/xalan.jar"/>
         <property name="manifest-cp-proprietary-46" value="${manifest-cp-proprietary-45}
../lib/xercesImpl.jar"/>

Modified: manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java?rev=1595708&r1=1595707&r2=1595708&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
(original)
+++ manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
Sun May 18 23:56:13 2014
@@ -47,10 +47,12 @@ public class ManifoldCFCombinedJettyRunn
   public static final String combinedWarPathProperty = "org.apache.manifoldcf.combinedwarpath";
   public static final String jettyPortProperty = "org.apache.manifoldcf.jettyport";
   
+  protected final int port;
   protected Server server;
   
   public ManifoldCFCombinedJettyRunner( int port, String combinedWarPath )
   {
+    this.port = port;
     server = new Server( port );    
     server.setStopAtShutdown( true );
     
@@ -109,11 +111,14 @@ public class ManifoldCFCombinedJettyRunn
   public int getLocalPort()
     throws ManifoldCFException
   {
+    return this.port;
+    /*
     Connector[] conns = server.getConnectors();
     if (0 == conns.length) {
       throw new ManifoldCFException("Jetty Server has no Connectors");
     }
     return conns[0].getLocalPort();
+    */
   }
 
   /**

Modified: manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java?rev=1595708&r1=1595707&r2=1595708&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
(original)
+++ manifoldcf/branches/CONNECTORS-938/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
Sun May 18 23:56:13 2014
@@ -51,10 +51,12 @@ public class ManifoldCFJettyRunner
   public static final String useJettyParentClassLoaderProperty = "org.apache.manifoldcf.usejettyparentclassloader";
   public static final String jettyPortProperty = "org.apache.manifoldcf.jettyport";
   
+  protected final int port;
   protected Server server;
   
   public ManifoldCFJettyRunner( int port, String crawlerWarPath, String authorityServiceWarPath,
String apiWarPath, boolean useParentLoader )
   {
+    this.port = port;
     server = new Server( port );    
     server.setStopAtShutdown( true );
     
@@ -125,11 +127,14 @@ public class ManifoldCFJettyRunner
   public int getLocalPort()
     throws ManifoldCFException
   {
+    return this.port;
+    /*
     Connector[] conns = server.getConnectors();
     if (0 == conns.length) {
       throw new ManifoldCFException("Jetty Server has no Connectors");
     }
     return conns[0].getLocalPort();
+    */
   }
 
   /** Run the agents process.  This method will not return unless the agents process is shut
down.



Mime
View raw message