incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1327782 [1/2] - in /incubator/lcf/trunk: ./ connectors/ connectors/elasticsearch/ connectors/opensearchserver/ dist-license/ framework/ framework/jetty-runner/ framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ framewo...
Date Thu, 19 Apr 2012 02:25:28 GMT
Author: kwright
Date: Thu Apr 19 02:25:26 2012
New Revision: 1327782

URL: http://svn.apache.org/viewvc?rev=1327782&view=rev
Log:
Fix for CONNECTORS-459.

Added:
    incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/CMISServer.java
      - copied unchanged from r1327781, incubator/lcf/branches/CONNECTORS-459/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/CMISServer.java
Removed:
    incubator/lcf/trunk/json/
Modified:
    incubator/lcf/trunk/   (props changed)
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/DEPENDENCIES.txt
    incubator/lcf/trunk/LICENSE.txt
    incubator/lcf/trunk/README.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/connector-build.xml
    incubator/lcf/trunk/connectors/elasticsearch/pom.xml
    incubator/lcf/trunk/connectors/opensearchserver/pom.xml
    incubator/lcf/trunk/dist-license/DEPENDENCIES.txt
    incubator/lcf/trunk/dist-license/README.txt
    incubator/lcf/trunk/framework/build.xml
    incubator/lcf/trunk/framework/jetty-runner/pom.xml
    incubator/lcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
    incubator/lcf/trunk/framework/pull-agent/pom.xml
    incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java
    incubator/lcf/trunk/framework/script-engine/pom.xml
    incubator/lcf/trunk/framework/ui-core/pom.xml
    incubator/lcf/trunk/pom.xml
    incubator/lcf/trunk/tests/alfresco/pom.xml
    incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java
    incubator/lcf/trunk/tests/cmis/pom.xml
    incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/BaseDerby.java
    incubator/lcf/trunk/tests/elasticsearch/pom.xml
    incubator/lcf/trunk/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/BaseDerby.java
    incubator/lcf/trunk/tests/filesystem/pom.xml
    incubator/lcf/trunk/tests/rss/pom.xml
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/MockRSSService.java
    incubator/lcf/trunk/tests/test-build.xml
    incubator/lcf/trunk/tests/wiki/pom.xml
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/MockWikiService.java

Propchange: incubator/lcf/trunk/
------------------------------------------------------------------------------
  Merged /incubator/lcf/branches/CONNECTORS-459:r1326580-1327781

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Thu Apr 19 02:25:26 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.6-dev =====================
 
+CONNECTORS-459: Upgrade to require JDK 1.6 across the board.  Get the
+(broken) maven build also working consistently with the ant build.
+(Karl Wright)
+
 CONNECTORS-435: Replace incorrect Messages.getString() calls in the main
 UI with correct ones.
 (Erlend GarĂ¥sen, Karl Wright)

Modified: incubator/lcf/trunk/DEPENDENCIES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/DEPENDENCIES.txt?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/DEPENDENCIES.txt (original)
+++ incubator/lcf/trunk/DEPENDENCIES.txt Thu Apr 19 02:25:26 2012
@@ -1,6 +1,6 @@
 ManifoldCF requires
 ------------------
-* JRE 1.5 or above
+* JRE 1.6 or above
 * SVN client, version 1.7 or above
 * Apache Ant, version 1.7 or above
 * Apache Forrest, version 0.9-dev or above

Modified: incubator/lcf/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/LICENSE.txt?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/LICENSE.txt (original)
+++ incubator/lcf/trunk/LICENSE.txt Thu Apr 19 02:25:26 2012
@@ -175,31 +175,3 @@
 
    END OF TERMS AND CONDITIONS
 
-
-==========================================================================
-This product includes code from: http://www.json.org
-License: JSON license (http://www.json.org/license.html)
---------------------------------------------------------------------------
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE. 
-

Modified: incubator/lcf/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/README.txt?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/README.txt (original)
+++ incubator/lcf/trunk/README.txt Thu Apr 19 02:25:26 2012
@@ -33,10 +33,10 @@ Instructions for Building Apache Manifol
    
 3. Copy the lib folder in the lib distribution into the source distribution.
 
-4. Download the Java SE 5 JDK (Java Development Kit), or greater, from http://java.sun.com.
+4. Download the Java SE 6 JDK (Java Development Kit), or greater, from http://java.sun.com.
    You will need the JDK installed, and the %JAVA_HOME%\bin directory included
    on your command path.  To test this, issue a "java -version" command from your
-   shell and verify that the Java version is 1.5 or greater.
+   shell and verify that the Java version is 1.6 or greater.
 
 5. Download the Apache Ant binary distribution (1.7.0 or greater) from http://ant.apache.org.
    You will need Ant installed and the %ANT_HOME%\bin directory included on your

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Thu Apr 19 02:25:26 2012
@@ -22,7 +22,7 @@
     <target name="downloaded-condition">
         <!-- Spot check a few of the dependent jars; no point including ALL of them here... -->
         <available file="lib/derby.jar" property="derby-found"/>
-        <available file="lib/jetty.jar" property="jetty-found"/>
+        <available file="lib/jetty-server.jar" property="jetty-found"/>
         <available file="lib/commons-httpclient.jar" property="httpclient-found"/>
         <available file="lib/xercesImpl.jar" property="xerces-found"/>
         <available file="lib/fop.jar" property="fop-found"/>
@@ -162,20 +162,7 @@
       <echo message="Site did not build.  Was FORREST_HOME set properly?"/>
     </target>
     
-    <target name="build-json">
-        <mkdir dir="build/json/classes"/>
-        <javac srcdir="json" destdir="build/json/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-            </classpath>
-        </javac>
-    </target>
-    
-    <target name="jar-json" depends="build-json">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/json.jar" basedir="build/json/classes"/>
-    </target>
-    
-    <target name="setup-framework" depends="jar-json,downloaded-check" if="downloaded"/>
+    <target name="setup-framework" depends="downloaded-check" if="downloaded"/>
       
       <target name="build-framework" depends="setup-framework" if="downloaded">
         <ant dir="framework" target="build"/>
@@ -1740,9 +1727,6 @@
     <target name="calculate-elasticsearch-tests-condition" depends="calculate-elasticsearch-testmaterials-condition,calculate-elasticsearch-condition,calculate-cmis-condition">
       <condition property="elasticsearch-tests.include">
         <and>
-        	  <not>
-                <equals arg1="${ant.java.version}" arg2="1.5" />
-            </not>
             <isset property="elasticsearch.include"/>
             <isset property="elasticsearch-testmaterials.include"/>
             <isset property="cmis.include"/>
@@ -2592,9 +2576,6 @@ Use Apache Forrest version forrest-0.9-d
     <target name="rat-sources" depends="-taskdef"
       description="runs the tasks over src/java excluding the license directory">
       <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
-        <fileset dir="json/">
-          <exclude name="**/*.java"/>
-        </fileset>
         <fileset dir="mod-authz-annotate/">
         </fileset>
         <fileset dir="connectors/">
@@ -2672,6 +2653,17 @@ Use Apache Forrest version forrest-0.9-d
         </java>
     </target>
 
+    <target name="download-json">
+        <mkdir dir="lib"/>
+        <antcall target="download-via-maven">
+            <param name="project-path" value="org/json"/>
+            <param name="artifact-version" value="20090211"/>
+            <param name="target" value="lib"/>
+            <param name="artifact-name" value="json"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
+    
     <target name="download-derby">
         <mkdir dir="lib"/>
         <property name="derby-version" value="10.8.2.2"/>
@@ -2744,27 +2736,24 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-hsqldb">
         <mkdir dir="lib"/>
-        <!-- Download and build a jdk-1.5 version of hsqldb 2.2.8 -->
-        <mkdir dir="build/download"/>
-        <delete dir="build/download/hsqldb"/>
-        <antcall target="checkout-source-via-svn">
-            <param name="root-dir" value="build/download"/>
-            <param name="svn-url" value="http://hsqldb.svn.sourceforge.net/svnroot/hsqldb/base/tags/2.2.8"/>
-            <param name="dir-name" value="hsqldb"/>
+        <antcall target="download-via-maven">
+            <param name="project-path" value="org/hsqldb"/>
+            <param name="artifact-version" value="2.2.8"/>
+            <param name="target" value="lib"/>
+            <param name="artifact-name" value="hsqldb"/>
+            <param name="artifact-type" value="jar"/>
         </antcall>
-        <!-- Build it -->
-        <exec dir="build/download/hsqldb/build" executable="cmd" osfamily="windows" failifexecutionfails="true" failonerror="true">
-            <arg line="/c ant.bat hsqldb"/>
-        </exec>
-        <exec dir="build/download/hsqldb/build" executable="ant" osfamily="unix" failifexecutionfails="true" failonerror="true">
-            <arg value="hsqldb" />
-        </exec>
-        <copy todir="lib" file="build/download/hsqldb/lib/hsqldb.jar"/>
     </target>
     
     <target name="download-postgresql">
         <mkdir dir="lib"/>
-        <get src="http://jdbc.postgresql.org/download/postgresql-9.1-901.jdbc3.jar" dest="lib/postgresql.jar"/>
+        <antcall target="download-via-maven">
+            <param name="project-path" value="postgresql"/>
+            <param name="artifact-version" value="9.1-901.jdbc4"/>
+            <param name="target" value="lib"/>
+            <param name="artifact-name" value="postgresql"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
     </target>
 
     <target name="download-axis">
@@ -2912,17 +2901,35 @@ Use Apache Forrest version forrest-0.9-d
         <ant dir="build/download/commons-httpclient" target="dist"/>
         <copy todir="lib" file="build/download/commons-httpclient/dist/commons-httpclient.jar"/>
     </target>
+  
+    <target name="download-slf4j">
+        <mkdir dir="lib"/>
+        <property name="slf4j-version" value="1.6.4"/>
+        <property name="slf4j-package" value="org/slf4j"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param name="artifact-version" value="${slf4j-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="slf4j-api"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param name="artifact-version" value="${slf4j-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="slf4j-simple"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
     
     <target name="download-jetty">
         <mkdir dir="lib"/>
-        <property name="jetty-version" value="6.1.26"/>
-        <property name="jetty-package" value="org/mortbay/jetty"/>
+        <property name="jetty-version" value="7.5.4.v20111024"/>
+        <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"/>
+            <param name="artifact-name" value="jetty-server"/>
             <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-naming"/>
+            <param name="artifact-name" value="jetty-webapp"/>
+            <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-servlet"/>
             <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"/>
@@ -2934,7 +2941,27 @@ 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="jsp-2.1-jetty"/>
+            <param name="artifact-name" value="jetty-http"/>
+            <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-io"/>
+            <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-security"/>
+            <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-continuation"/>
+            <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-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"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
@@ -3367,7 +3394,7 @@ Use Apache Forrest version forrest-0.9-d
         </copy>
     </target>
 
-    <target name="make-core-deps" depends="download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-jdbcpool,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
+    <target name="make-core-deps" depends="download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-jdbcpool,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Modified: incubator/lcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/connector-build.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/connector-build.xml (original)
+++ incubator/lcf/trunk/connectors/connector-build.xml Thu Apr 19 02:25:26 2012
@@ -30,10 +30,8 @@
     </target>
 
     <path id="mcf-connector-build.connector-classpath">
-        <fileset dir="../../build/jar">
-            <include name="json.jar"/>
-        </fileset>
         <fileset dir="../../lib">
+            <include name="json*.jar"/>
             <include name="commons-codec*.jar"/>
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
@@ -45,6 +43,7 @@
             <include name="eclipse*.jar"/>
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
+            <include name="slf4j*.jar"/>
             <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
@@ -212,7 +211,7 @@
 
     <target name="compile-wsdls" depends="has-wsdls-check" if="hasWSDLs">
         <mkdir dir="build/wsdlclasses"/>
-        <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+        <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <fileset dir="../../lib">
                     <include name="axis*.jar"/>
@@ -234,7 +233,7 @@
 
     <target name="compile-xsds" depends="has-xsds-check" if="hasXSDs">
         <mkdir dir="build/xsdclasses"/>
-        <javac srcdir="build/xsdjava" destdir="build/xsdclasses" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+        <javac srcdir="build/xsdjava" destdir="build/xsdclasses" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <fileset dir="../../lib">
                     <include name="castor*.jar"/>
@@ -263,7 +262,7 @@
 
     <target name="doc-rmi" depends="compile-wsdls,compile-xsds,has-RMI-check" if="hasRMI">
         <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.5">
+        <javadoc destdir="dist/doc" source="1.6">
             <classpath>
                 <path refid="connector-classpath"/>
             </classpath>
@@ -274,7 +273,7 @@
 
     <target name="doc" depends="doc-rmi,compile-wsdls,compile-xsds,has-RMI-check,precompile-check" if="canBuild" unless="hasRMI">
         <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.5">
+        <javadoc destdir="dist/doc" source="1.6">
             <classpath>
                 <path refid="connector-classpath"/>
             </classpath>
@@ -311,7 +310,7 @@
     
     <target name="compile-server" depends="compile-interface,compile-implementation,compile-rmic,has-RMI-check" if="hasRMI">
         <mkdir dir="build/server/classes"/>
-        <javac srcdir="server/src/main/java" destdir="build/server/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="server/src/main/java" destdir="build/server/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <pathelement location="build/interface/classes"/>
                 <pathelement location="build/implementation/classes"/>
@@ -323,7 +322,7 @@
 
     <target name="compile-registry" depends="compile-interface,has-RMI-check" if="hasRMI">
         <mkdir dir="build/registry/classes"/>
-        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <pathelement location="build/interface/classes"/>
             </classpath>
@@ -332,7 +331,7 @@
 
     <target name="compile-connector" depends="compile-connector-native2ascii,compile-connector-resources,compile-wsdls,compile-xsds,compile-interface,compile-rmic,precompile-check" if="canBuild">
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="connector-classpath"/>
             </classpath>
@@ -341,7 +340,7 @@
 
     <target name="compile-implementation" depends="compile-interface,has-RMI-check" if="hasRMI">
         <mkdir dir="build/implementation/classes"/>
-        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="implementation-classpath"/>
             </classpath>
@@ -350,7 +349,7 @@
 
     <target name="compile-interface" depends="has-RMI-check" if="hasRMI">
         <mkdir dir="build/interface/classes"/>
-        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="interface-classpath"/>
             </classpath>
@@ -366,7 +365,7 @@
 
     <target name="compile-tests" depends="compile-connector,compile-test-resources,has-tests-check" if="hasTests">
         <mkdir dir="build/connector-tests/classes"/>
-        <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="connector-test-classpath"/>
             </classpath>

Modified: incubator/lcf/trunk/connectors/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/elasticsearch/pom.xml (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/pom.xml Thu Apr 19 02:25:26 2012
@@ -92,18 +92,18 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/lcf/trunk/connectors/opensearchserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/opensearchserver/pom.xml (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/pom.xml Thu Apr 19 02:25:26 2012
@@ -92,18 +92,18 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/lcf/trunk/dist-license/DEPENDENCIES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/dist-license/DEPENDENCIES.txt?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/dist-license/DEPENDENCIES.txt (original)
+++ incubator/lcf/trunk/dist-license/DEPENDENCIES.txt Thu Apr 19 02:25:26 2012
@@ -1,6 +1,6 @@
 ManifoldCF requires
 ------------------
-* JRE 1.5 or above
+* JRE 1.6 or above
 * Many other libraries, available from the ManifoldCF XXX-lib distribution
 
 For running ManifoldCF:

Modified: incubator/lcf/trunk/dist-license/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/dist-license/README.txt?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/dist-license/README.txt (original)
+++ incubator/lcf/trunk/dist-license/README.txt Thu Apr 19 02:25:26 2012
@@ -29,11 +29,11 @@ Getting Started
 
 Since you downloaded the binary version of the package, you can just run it.
 
-1. Download and install the Java SE 5 JDK (Java Development Kit), or greater,
+1. Download and install the Java SE 6 JDK (Java Development Kit), or greater,
    from http://java.sun.com.  You will need the JDK installed, and the
    %JAVA_HOME%/bin directory included on your command path.  To test this,
    issue a "java -version" command from your shell and verify that the Java
-   version is 1.5 or greater.
+   version is 1.6 or greater.
    
 2. In your shell, change to the single-process example directory, "example".
 

Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Thu Apr 19 02:25:26 2012
@@ -31,10 +31,8 @@
     </target>
     
     <path id="framework-classpath">
-        <fileset dir="../build/jar">
-            <include name="json.jar"/>
-        </fileset>
         <fileset dir="../lib">
+            <include name="json*.jar"/>
             <include name="commons-codec*.jar"/>
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
@@ -46,6 +44,7 @@
             <include name="ecj*.jar"/>
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
+            <include name="slf4j*.jar"/>
             <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
@@ -74,7 +73,7 @@
     
     <target name="doc">
         <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" maxmemory="256M" source="1.5" useexternalfile="true">
+        <javadoc destdir="dist/doc" maxmemory="256M" source="1.6" useexternalfile="true">
             <classpath>
                 <path refid="framework-classpath"/>
             </classpath>
@@ -89,7 +88,7 @@
     
     <target name="compile-core">
         <mkdir dir="build/core/classes"/>
-        <javac srcdir="core/src/main/java" destdir="build/core/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="core/src/main/java" destdir="build/core/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
             </classpath>
@@ -98,7 +97,7 @@
 
     <target name="compile-ui-core" depends="compile-core">
         <mkdir dir="build/ui-core/classes"/>
-        <javac srcdir="ui-core/src/main/java" destdir="build/ui-core/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="ui-core/src/main/java" destdir="build/ui-core/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -109,7 +108,7 @@
 
     <target name="compile-agents" depends="compile-core">
         <mkdir dir="build/agents/classes"/>
-        <javac srcdir="agents/src/main/java" destdir="build/agents/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="agents/src/main/java" destdir="build/agents/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -119,7 +118,7 @@
 
     <target name="compile-pull-agent" depends="compile-core,compile-agents">
         <mkdir dir="build/pull-agent/classes"/>
-        <javac srcdir="pull-agent/src/main/java" destdir="build/pull-agent/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="pull-agent/src/main/java" destdir="build/pull-agent/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -130,7 +129,7 @@
 
     <target name="compile-jetty-runner" depends="compile-core,compile-agents">
         <mkdir dir="build/jetty-runner/classes"/>
-        <javac srcdir="jetty-runner/src/main/java" destdir="build/jetty-runner/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="jetty-runner/src/main/java" destdir="build/jetty-runner/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -142,7 +141,7 @@
 
     <target name="compile-script-engine" depends="compile-core">
         <mkdir dir="build/script-engine/classes"/>
-        <javac srcdir="script-engine/src/main/java" destdir="build/script-engine/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="script-engine/src/main/java" destdir="build/script-engine/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -152,7 +151,7 @@
 
     <target name="compile-authority-servlet" depends="compile-core,compile-agents,compile-pull-agent">
         <mkdir dir="build/authority-servlet/classes"/>
-        <javac srcdir="authority-servlet/src/main/java" destdir="build/authority-servlet/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="authority-servlet/src/main/java" destdir="build/authority-servlet/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -164,7 +163,7 @@
 
     <target name="compile-api-servlet" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent">
         <mkdir dir="build/api-servlet/classes"/>
-        <javac srcdir="api-servlet/src/main/java" destdir="build/api-servlet/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="api-servlet/src/main/java" destdir="build/api-servlet/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -192,7 +191,7 @@
         <jasper2 validateXml="false" uriroot="crawler-ui/src/main/webapp" webXmlFragment="build/crawler-ui/web-generated.xml" outputDir="build/crawler-ui/java" /> 
         <!-- Compile java classes -->
         <mkdir dir="build/crawler-ui/classes"/>
-        <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath id="classpath">
                 <pathelement location="${java.home}/../lib/tools.jar"/>
                 <path refid="framework-classpath"/>
@@ -245,10 +244,8 @@
     <target name="webapp-authority-service" depends="jar-core,jar-agents,jar-pull-agent,compile-authority-servlet">
         <mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
         <copy todir="build/webapp/authority-service/WEB-INF/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -283,10 +280,8 @@
     <target name="webapp-authority-service-proprietary" depends="jar-core,jar-agents,jar-pull-agent,compile-authority-servlet">
         <mkdir dir="build/webapp/authority-service-proprietary/WEB-INF/lib"/>
         <copy todir="build/webapp/authority-service-proprietary/WEB-INF/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -326,10 +321,8 @@
     <target name="webapp-api-service" depends="jar-core,jar-ui-core,jar-agents,jar-pull-agent,compile-api-servlet">
         <mkdir dir="build/webapp/api-service/WEB-INF/lib"/>
         <copy todir="build/webapp/api-service/WEB-INF/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -365,10 +358,8 @@
     <target name="webapp-api-service-proprietary" depends="jar-core,jar-ui-core,jar-agents,jar-pull-agent,compile-api-servlet">
         <mkdir dir="build/webapp/api-service-proprietary/WEB-INF/lib"/>
         <copy todir="build/webapp/api-service-proprietary/WEB-INF/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -411,11 +402,7 @@
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
             <fileset dir="../lib">
                 <include name="jstl*.jar"/>
-            </fileset>
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
-            <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -460,11 +447,7 @@
         <copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
             <fileset dir="../lib">
                 <include name="jstl*.jar"/>
-            </fileset>
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
-            <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -566,10 +549,8 @@
     <target name="multi-processes" depends="jar-core,jar-agents,jar-pull-agent">
         <mkdir dir="dist/multiprocess-example/processes/lib"/>
         <copy todir="dist/multiprocess-example/processes/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -607,10 +588,8 @@
     <target name="multi-processes-proprietary" depends="jar-core,jar-agents,jar-pull-agent">
         <mkdir dir="dist/multiprocess-example-proprietary/processes/lib"/>
         <copy todir="dist/multiprocess-example-proprietary/processes/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -664,10 +643,8 @@
         </copy>
         <mkdir dir="dist/multiprocess-example/lib"/>
         <copy todir="dist/multiprocess-example/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
             </fileset>
@@ -680,6 +657,7 @@
             </fileset>
             <fileset dir="../lib">
                 <include name="jetty*.jar"/>
+                <include name="slf4j*.jar"/>
                 <include name="servlet-api*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
@@ -705,10 +683,8 @@
         </copy>
         <mkdir dir="dist/multiprocess-example-proprietary/lib"/>
         <copy todir="dist/multiprocess-example-proprietary/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
             </fileset>
@@ -721,6 +697,7 @@
             </fileset>
             <fileset dir="../lib">
                 <include name="jetty*.jar"/>
+                <include name="slf4j*.jar"/>
                 <include name="servlet-api*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
@@ -735,10 +712,8 @@
     <target name="script-engine" depends="jar-script-engine,jar-core">
         <mkdir dir="dist/script-engine/lib"/>
         <copy todir="dist/script-engine/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-httpclient*.jar"/>
@@ -763,10 +738,8 @@
     <target name="single-process-example" depends="jar-jetty-runner,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
         <mkdir dir="dist/example/lib"/>
         <copy todir="dist/example/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -779,6 +752,7 @@
                 <include name="jasper*.jar"/>
                 <include name="jdbcpool*.jar"/>
                 <include name="jetty*.jar"/>
+                <include name="slf4j*.jar"/>
                 <include name="jsp-api*.jar"/>
                 <include name="jsp-2.5*.jar"/>
                 <include name="log4j*.jar"/>
@@ -848,7 +822,7 @@
         <property name="manifest-cp-27" value="${manifest-cp-26} lib/jasper.jar"/>
         <property name="manifest-cp-28" value="${manifest-cp-27} lib/jasper-el.jar"/>
         <property name="manifest-cp-29" value="${manifest-cp-28} lib/jdbcpool.jar"/>
-        <property name="manifest-cp-30" value="${manifest-cp-29} lib/jetty.jar"/>
+        <property name="manifest-cp-30" value="${manifest-cp-29} lib/jetty-server.jar"/>
         <property name="manifest-cp-31" value="${manifest-cp-30} lib/jetty-util.jar"/>
         <property name="manifest-cp-32" value="${manifest-cp-31} lib/jsp-api-2.1-glassfish.jar"/>
         <property name="manifest-cp-33" value="${manifest-cp-32} lib/json.jar"/>
@@ -867,8 +841,17 @@
         <property name="manifest-cp-47" value="${manifest-cp-46} lib/xml-apis.jar"/>
         <property name="manifest-cp-48" value="${manifest-cp-47} lib/derbynet.jar"/>
         <property name="manifest-cp-49" value="${manifest-cp-48} lib/ecj.jar"/>
-        <property name="manifest-cp-52" value="${manifest-cp-49} lib/velocity.jar"/>
-        <property name="manifest-cp" value="${manifest-cp-52}"/>
+        <property name="manifest-cp-50" value="${manifest-cp-49} lib/jetty-webapp.jar"/>
+        <property name="manifest-cp-51" value="${manifest-cp-50} lib/jetty-servlet.jar"/>
+        <property name="manifest-cp-52" value="${manifest-cp-51} lib/velocity.jar"/>
+        <property name="manifest-cp-53" value="${manifest-cp-52} lib/jetty-http.jar"/>
+        <property name="manifest-cp-54" value="${manifest-cp-53} lib/jetty-io.jar"/>
+        <property name="manifest-cp-55" value="${manifest-cp-54} lib/jetty-security.jar"/>
+        <property name="manifest-cp-56" value="${manifest-cp-55} lib/jetty-continuation.jar"/>
+        <property name="manifest-cp-57" value="${manifest-cp-56} lib/jetty-xml.jar"/>
+        <property name="manifest-cp-58" value="${manifest-cp-57} lib/slf4j-api.jar"/>
+        <property name="manifest-cp-59" value="${manifest-cp-58} lib/slf4j-simple.jar"/>
+        <property name="manifest-cp" value="${manifest-cp-59}"/>
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -882,10 +865,8 @@
     <target name="single-process-example-proprietary" depends="jar-jetty-runner,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
         <mkdir dir="dist/example-proprietary/lib"/>
         <copy todir="dist/example-proprietary/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -898,6 +879,7 @@
                 <include name="jasper*.jar"/>
                 <include name="jdbcpool*.jar"/>
                 <include name="jetty*.jar"/>
+                <include name="slf4j*.jar"/>
                 <include name="jsp-api*.jar"/>
                 <include name="jsp-2.5*.jar"/>
                 <include name="log4j*.jar"/>
@@ -972,7 +954,7 @@
         <property name="manifest-cp-proprietary-27" value="${manifest-cp-proprietary-26} lib/jasper.jar"/>
         <property name="manifest-cp-proprietary-28" value="${manifest-cp-proprietary-27} lib/jasper-el.jar"/>
         <property name="manifest-cp-proprietary-29" value="${manifest-cp-proprietary-28} lib/jdbcpool.jar"/>
-        <property name="manifest-cp-proprietary-30" value="${manifest-cp-proprietary-29} lib/jetty.jar"/>
+        <property name="manifest-cp-proprietary-30" value="${manifest-cp-proprietary-29} lib/jetty-server.jar"/>
         <property name="manifest-cp-proprietary-31" value="${manifest-cp-proprietary-30} lib/jetty-util.jar"/>
         <property name="manifest-cp-proprietary-32" value="${manifest-cp-proprietary-31} lib/jsp-api-2.1-glassfish.jar"/>
         <property name="manifest-cp-proprietary-33" value="${manifest-cp-proprietary-32} lib/json.jar"/>
@@ -995,7 +977,16 @@
         <property name="manifest-cp-proprietary-50" value="${manifest-cp-proprietary-49} lib/ojdbc.jar"/>
         <property name="manifest-cp-proprietary-51" value="${manifest-cp-proprietary-50} lib/jtds.jar"/>
         <property name="manifest-cp-proprietary-52" value="${manifest-cp-proprietary-51} lib/velocity.jar"/>
-        <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-52}"/>
+        <property name="manifest-cp-proprietary-53" value="${manifest-cp-proprietary-52} lib/jetty-webapp.jar"/>
+        <property name="manifest-cp-proprietary-54" value="${manifest-cp-proprietary-53} lib/jetty-servlet.jar"/>
+        <property name="manifest-cp-proprietary-55" value="${manifest-cp-proprietary-54} lib/jetty-http.jar"/>
+        <property name="manifest-cp-proprietary-56" value="${manifest-cp-proprietary-55} lib/jetty-io.jar"/>
+        <property name="manifest-cp-proprietary-57" value="${manifest-cp-proprietary-56} lib/jetty-security.jar"/>
+        <property name="manifest-cp-proprietary-58" value="${manifest-cp-proprietary-57} lib/jetty-continuation.jar"/>
+        <property name="manifest-cp-proprietary-59" value="${manifest-cp-proprietary-58} lib/jetty-xml.jar"/>
+        <property name="manifest-cp-proprietary-60" value="${manifest-cp-proprietary-59} lib/slf4j-api.jar"/>
+        <property name="manifest-cp-proprietary-61" value="${manifest-cp-proprietary-60} lib/slf4j-simple.jar"/>
+        <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-61}"/>
         <mkdir dir="build/example-proprietary"/>
         <manifest file="build/example-proprietary/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -1007,7 +998,7 @@
 
     <target name="compile-core-tests" depends="compile-core">
         <mkdir dir="build/core-tests/classes"/>
-        <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -1017,7 +1008,7 @@
 
     <target name="compile-agents-tests" depends="compile-core-tests,compile-agents">
         <mkdir dir="build/agents-tests/classes"/>
-        <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -1029,7 +1020,7 @@
 
     <target name="compile-pull-agent-tests" depends="compile-agents-tests,compile-pull-agent">
         <mkdir dir="build/pull-agent-tests/classes"/>
-        <javac srcdir="pull-agent/src/test/java" destdir="build/pull-agent-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="pull-agent/src/test/java" destdir="build/pull-agent-tests/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -1043,7 +1034,7 @@
 
     <target name="compile-script-engine-tests" depends="compile-core,compile-script-engine">
         <mkdir dir="build/script-engine-tests/classes"/>
-        <javac srcdir="script-engine/src/test/java" destdir="build/script-engine-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="script-engine/src/test/java" destdir="build/script-engine-tests/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>

Modified: incubator/lcf/trunk/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/jetty-runner/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/jetty-runner/pom.xml (original)
+++ incubator/lcf/trunk/framework/jetty-runner/pom.xml Thu Apr 19 02:25:26 2012
@@ -210,24 +210,71 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.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>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
 
     <!-- databases -->

Modified: incubator/lcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java (original)
+++ incubator/lcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java Thu Apr 19 02:25:26 2012
@@ -30,13 +30,10 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.FilterHolder;
-import org.mortbay.log.Logger;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
 
 /**
  * Run ManifoldCF with jetty.
@@ -63,21 +60,23 @@ public class ManifoldCFJettyRunner
     server.setStopAtShutdown( true );
     
     // Initialize the servlets
+    ContextHandlerCollection contexts = new ContextHandlerCollection();
+    server.setHandler(contexts);
     WebAppContext lcfCrawlerUI = new WebAppContext(crawlerWarPath,"/mcf-crawler-ui");
     // This can cause jetty to ignore all of the framework and jdbc jars in the war, which is what we
     // want in the single-process case.
     lcfCrawlerUI.setParentLoaderPriority(useParentLoader);
-    server.addHandler(lcfCrawlerUI);
+    contexts.addHandler(lcfCrawlerUI);
     WebAppContext lcfAuthorityService = new WebAppContext(authorityServiceWarPath,"/mcf-authority-service");
     // This can cause jetty to ignore all of the framework and jdbc jars in the war, which is what we
     // want in the single-process case.
     lcfAuthorityService.setParentLoaderPriority(useParentLoader);
-    server.addHandler(lcfAuthorityService);
+    contexts.addHandler(lcfAuthorityService);
     WebAppContext lcfApi = new WebAppContext(apiWarPath,"/mcf-api-service");
     // This can cause jetty to ignore all of the framework and jdbc jars in the war, which is what we
     // want in the single-process case.
     lcfApi.setParentLoaderPriority(useParentLoader);
-    server.addHandler(lcfApi);
+    contexts.addHandler(lcfApi);
   }
 
   public void start()

Modified: incubator/lcf/trunk/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/pom.xml (original)
+++ incubator/lcf/trunk/framework/pull-agent/pom.xml Thu Apr 19 02:25:26 2012
@@ -75,29 +75,62 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-      <scope>test</scope>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
-      <scope>test</scope>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.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>${jsp-2.1-glassfish.version}</version>
-      <scope>test</scope>
+      <version>${glassfish.version}</version>
     </dependency>
 
     <dependency>

Modified: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java Thu Apr 19 02:25:26 2012
@@ -27,13 +27,11 @@ import java.io.*;
 import java.util.*;
 import org.junit.*;
 
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.FilterHolder;
-import org.mortbay.log.Logger;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.methods.*;
@@ -420,17 +418,19 @@ public class ManifoldCFInstance
 
     
     // Initialize the servlets
+    ContextHandlerCollection contexts = new ContextHandlerCollection();
+    server.setHandler(contexts);
     WebAppContext lcfCrawlerUI = new WebAppContext(crawlerWarPath,"/mcf-crawler-ui");
     // This will cause jetty to ignore all of the framework and jdbc jars in the war, which is what we want.
     lcfCrawlerUI.setParentLoaderPriority(true);
-    server.addHandler(lcfCrawlerUI);
+    contexts.addHandler(lcfCrawlerUI);
     WebAppContext lcfAuthorityService = new WebAppContext(authorityserviceWarPath,"/mcf-authority-service");
     // This will cause jetty to ignore all of the framework and jdbc jars in the war, which is what we want.
     lcfAuthorityService.setParentLoaderPriority(true);
-    server.addHandler(lcfAuthorityService);
+    contexts.addHandler(lcfAuthorityService);
     WebAppContext lcfApi = new WebAppContext(apiWarPath,"/mcf-api-service");
     lcfApi.setParentLoaderPriority(true);
-    server.addHandler(lcfApi);
+    contexts.addHandler(lcfApi);
     server.start();
 
     // If all worked, then we can start the daemon.

Modified: incubator/lcf/trunk/framework/script-engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/script-engine/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/script-engine/pom.xml (original)
+++ incubator/lcf/trunk/framework/script-engine/pom.xml Thu Apr 19 02:25:26 2012
@@ -64,36 +64,36 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.0.1</version>
+      <version>${commons-io.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <version>${commons-collections.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20090211</version>
+      <version>${json.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/lcf/trunk/framework/ui-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/ui-core/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/ui-core/pom.xml (original)
+++ incubator/lcf/trunk/framework/ui-core/pom.xml Thu Apr 19 02:25:26 2012
@@ -69,9 +69,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
       <scope>provided</scope>
     </dependency>
 

Modified: incubator/lcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/pom.xml (original)
+++ incubator/lcf/trunk/pom.xml Thu Apr 19 02:25:26 2012
@@ -42,7 +42,7 @@
     <mysql.version>5.1.18</mysql.version>
     <hsqldb.version>2.2.8</hsqldb.version>
     <derby.version>10.8.2.2</derby.version>
-    <jetty.version>6.1.26</jetty.version>
+    <jetty.version>7.5.4.v20111024</jetty.version>
     <commons-codec.version>1.5</commons-codec.version>
     <commons-io.version>2.0.1</commons-io.version>
     <commons-logging.version>1.1.1</commons-logging.version>
@@ -56,13 +56,12 @@
     <jtds.version>1.2.4</jtds.version>
     <servlet-api.version>2.5</servlet-api.version>
     <jstl.version>1.2</jstl.version>
-    <jsp-api-2.1.version>6.1.14</jsp-api-2.1.version>
-    <jsp-api.version>2.1</jsp-api.version>
-    <jsp-2.1-glassfish.version>2.1.v20091210</jsp-2.1-glassfish.version>
+    <glassfish.version>2.1.v20091210</glassfish.version>
     <log4j.version>1.2.16</log4j.version>
     <jdbcpool.version>0.99</jdbcpool.version>
     <json.version>20090211</json.version>
     <velocity.version>1.7</velocity.version>
+    <slf4j.version>1.6.4</slf4j.version>
   </properties>
 
   <modules>

Modified: incubator/lcf/trunk/tests/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/alfresco/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/alfresco/pom.xml (original)
+++ incubator/lcf/trunk/tests/alfresco/pom.xml Thu Apr 19 02:25:26 2012
@@ -194,36 +194,80 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-naming</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-    	<groupId>org.mortbay.jetty</groupId>
-    	<artifactId>jetty-plus</artifactId>
-    	<version>${jetty.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-plus</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.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>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java (original)
+++ incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java Thu Apr 19 02:25:26 2012
@@ -18,9 +18,10 @@
 */
 package org.apache.manifoldcf.alfresco_tests;
 
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.plus.naming.Resource;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.plus.jndi.Resource;
 
 import org.junit.After;
 import org.junit.Before;
@@ -70,9 +71,12 @@ public class BaseDerby extends org.apach
       alfrescoServerWarPath = System.getProperty("alfrescoServerWarPath");
     
     //Initialize Alfresco Server bindings
+    ContextHandlerCollection contexts = new ContextHandlerCollection();
+    alfrescoServer.setHandler(contexts);
+
     WebAppContext alfrescoServerApi = new WebAppContext(alfrescoServerWarPath,"/alfresco");
     alfrescoServerApi.setParentLoaderPriority(false);
-    alfrescoServer.addHandler(alfrescoServerApi);
+    contexts.addHandler(alfrescoServerApi);
     
     Class h2DataSource = Thread.currentThread().getContextClassLoader().loadClass("org.h2.jdbcx.JdbcDataSource");
     Object o = h2DataSource.newInstance();

Modified: incubator/lcf/trunk/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/cmis/pom.xml (original)
+++ incubator/lcf/trunk/tests/cmis/pom.xml Thu Apr 19 02:25:26 2012
@@ -188,26 +188,75 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.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>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/BaseDerby.java?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/BaseDerby.java (original)
+++ incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/BaseDerby.java Thu Apr 19 02:25:26 2012
@@ -21,8 +21,6 @@ package org.apache.manifoldcf.cmis_tests
 import org.apache.manifoldcf.crawler.system.ManifoldCF;
 import org.junit.After;
 import org.junit.Before;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
 
 /** Tests that run the "agents daemon" should be derived from this 
  * 
@@ -31,7 +29,7 @@ import org.mortbay.jetty.webapp.WebAppCo
  * */
 public class BaseDerby extends org.apache.manifoldcf.crawler.tests.BaseITDerby
 {
-  protected Server cmisServer = null;
+  protected CMISServer cmisServer = null;
 
   
   protected String[] getConnectorNames()
@@ -60,34 +58,20 @@ public class BaseDerby extends org.apach
   public void setUpCMIS()
     throws Exception
   {
-    cmisServer = new Server(9090);
-    cmisServer.setStopAtShutdown(true);
-
     String openCmisServerWarPath = "../../lib/chemistry-opencmis-server-inmemory.war";
 
     if (System.getProperty("openCmisServerWarPath") != null)
       openCmisServerWarPath = System.getProperty("openCmisServerWarPath");
-    
-    //Initialize OpenCMIS Server bindings
-    WebAppContext openCmisServerApi = new WebAppContext(openCmisServerWarPath,"/chemistry-opencmis-server-inmemory");
-    openCmisServerApi.setParentLoaderPriority(false);
-    cmisServer.addHandler(openCmisServerApi);
-    
+
+    cmisServer = new CMISServer(9090, openCmisServerWarPath);
     cmisServer.start();
-    boolean entered = false;
-    
-    while(cmisServer.isStarted() 
-        && openCmisServerApi.isStarted()
-        && !entered){
-      entered = true;
-      ManifoldCF.sleep(5000);
-    }
   }
   
   @After
   public void cleanUpCMIS()
     throws Exception
   {
+    cmisServer.stop();
   }
   
 }

Modified: incubator/lcf/trunk/tests/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/elasticsearch/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/elasticsearch/pom.xml (original)
+++ incubator/lcf/trunk/tests/elasticsearch/pom.xml Thu Apr 19 02:25:26 2012
@@ -203,26 +203,75 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.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>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: incubator/lcf/trunk/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/BaseDerby.java?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/BaseDerby.java (original)
+++ incubator/lcf/trunk/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/BaseDerby.java Thu Apr 19 02:25:26 2012
@@ -22,8 +22,11 @@ import org.apache.manifoldcf.crawler.sys
 import org.elasticsearch.node.Node;
 import org.junit.After;
 import org.junit.Before;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
+
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
+
 import static org.elasticsearch.node.NodeBuilder.*;
 
 /**  
@@ -71,9 +74,11 @@ public class BaseDerby extends org.apach
       openCmisServerWarPath = System.getProperty("openCmisServerWarPath");
     
     //Initialize OpenCMIS Server bindings
+    ContextHandlerCollection contexts = new ContextHandlerCollection();
+    cmisServer.setHandler(contexts);
     WebAppContext openCmisServerApi = new WebAppContext(openCmisServerWarPath,"/chemistry-opencmis-server-inmemory");
     openCmisServerApi.setParentLoaderPriority(false);
-    cmisServer.addHandler(openCmisServerApi);
+    contexts.addHandler(openCmisServerApi);
     
     System.out.println("OpenCMIS InMemory server is starting...");
     cmisServer.start();

Modified: incubator/lcf/trunk/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/pom.xml?rev=1327782&r1=1327781&r2=1327782&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/pom.xml (original)
+++ incubator/lcf/trunk/tests/filesystem/pom.xml Thu Apr 19 02:25:26 2012
@@ -159,26 +159,75 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.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>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
+  
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>



Mime
View raw message