You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/02/25 23:03:35 UTC
svn commit: r1074713 - in /incubator/lcf/trunk: ./ lib/
Author: kwright
Date: Fri Feb 25 22:03:34 2011
New Revision: 1074713
URL: http://svn.apache.org/viewvc?rev=1074713&view=rev
Log:
Fix for CONNECTORS-165. Upgrade to a patched version of jetty 6.1.26.
Added:
incubator/lcf/trunk/lib/jetty-6.1.26-patched-JETTY-1340.jar (with props)
incubator/lcf/trunk/lib/jetty-util-6.1.26-patched-JETTY-1340.jar (with props)
incubator/lcf/trunk/lib/jsp-2.1-glassfish-2.1.v20091210.jar (with props)
incubator/lcf/trunk/lib/jsp-2.1-jetty-6.1.26.jar (with props)
incubator/lcf/trunk/lib/jsp-api-2.1-glassfish-2.1.v20091210.jar (with props)
Removed:
incubator/lcf/trunk/lib/jetty-6.1.22.jar
incubator/lcf/trunk/lib/jetty-util-6.1.22.jar
incubator/lcf/trunk/lib/jsp-2.1-glassfish-9.1.1.B60.25.p2.jar
incubator/lcf/trunk/lib/jsp-2.1-jetty-6.1.22.jar
incubator/lcf/trunk/lib/jsp-api-2.1-glassfish-9.1.1.B60.25.p2.jar
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/build.xml
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1074713&r1=1074712&r2=1074713&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Fri Feb 25 22:03:34 2011
@@ -3,6 +3,10 @@ $Id$
================== 0.2-dev ==================
+CONNECTORS-165: Upgrade to jetty 6.1.26, plus patches, which is what
+Solr is using.
+(Robert Muir, Karl Wright)
+
CONNECTORS-163: Use Derby 10.7.1.1.
(Oleg Tikhonov, Karl Wright)
Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1074713&r1=1074712&r2=1074713&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Fri Feb 25 22:03:34 2011
@@ -1423,7 +1423,7 @@
<mkdir dir="build/example"/>
<manifest file="build/example/manifest">
<attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
- <attribute name="Class-Path" value="lib/commons-codec.jar lib/commons-collections.jar lib/commons-el.jar lib/commons-fileupload.jar lib/commons-httpclient-mcf.jar lib/commons-io.jar lib/commons-logging.jar lib/hsqldb.jar lib/derbyclient.jar lib/derby.jar lib/derbyLocale_cs.jar lib/derbyLocale_de_DE.jar lib/derbyLocale_es.jar lib/derbyLocale_fr.jar lib/derbyLocale_hu.jar lib/derbyLocale_it.jar lib/derbyLocale_ja_JP.jar lib/derbyLocale_ko_KR.jar lib/derbyLocale_pl.jar lib/derbyLocale_pt_BR.jar lib/derbyLocale_ru.jar lib/derbyLocale_zh_CN.jar lib/derbyLocale_zh_TW.jar lib/derbynet.jar lib/derbyrun.jar lib/derbytools.jar lib/eclipse-ecj.jar lib/jasper-6.0.24.jar lib/jasper-el-6.0.24.jar lib/jdbcpool-0.99.jar lib/jetty-6.1.22.jar lib/jetty-util-6.1.22.jar lib/jsp-api-2.1-glassfish-9.1.1.B60.25.p2.jar lib/json.jar lib/mcf-agents.jar lib/mcf-core.jar lib/mcf-jetty-runner.jar lib/mcf-pull-agent.jar lib/mcf-ui-core.jar lib/log4j-1.2.jar lib/postgresql.jar lib/serializer.j
ar lib/servlet-api-2.5-20081211.jar lib/tomcat-juli-6.0.24.jar lib/xalan2.jar lib/xercesImpl-mcf.jar lib/xml-apis.jar"/>
+ <attribute name="Class-Path" value="lib/commons-codec.jar lib/commons-collections.jar lib/commons-el.jar lib/commons-fileupload.jar lib/commons-httpclient-mcf.jar lib/commons-io.jar lib/commons-logging.jar lib/hsqldb.jar lib/derbyclient.jar lib/derby.jar lib/derbyLocale_cs.jar lib/derbyLocale_de_DE.jar lib/derbyLocale_es.jar lib/derbyLocale_fr.jar lib/derbyLocale_hu.jar lib/derbyLocale_it.jar lib/derbyLocale_ja_JP.jar lib/derbyLocale_ko_KR.jar lib/derbyLocale_pl.jar lib/derbyLocale_pt_BR.jar lib/derbyLocale_ru.jar lib/derbyLocale_zh_CN.jar lib/derbyLocale_zh_TW.jar lib/derbynet.jar lib/derbyrun.jar lib/derbytools.jar lib/eclipse-ecj.jar lib/jasper-6.0.24.jar lib/jasper-el-6.0.24.jar lib/jdbcpool-0.99.jar lib/jetty-6.1.26-patched-JETTY-1340.jar lib/jetty-util-6.1.26-patched-JETTY-1340.jar lib/jsp-api-2.1-glassfish-2.1.v20091210.jar lib/json.jar lib/mcf-agents.jar lib/mcf-core.jar lib/mcf-jetty-runner.jar lib/mcf-pull-agent.jar lib/mcf-ui-core.jar lib/log4j-1.2.jar
lib/postgresql.jar lib/serializer.jar lib/servlet-api-2.5-20081211.jar lib/tomcat-juli-6.0.24.jar lib/xalan2.jar lib/xercesImpl-mcf.jar lib/xml-apis.jar"/>
</manifest>
<jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
</target>
Added: incubator/lcf/trunk/lib/jetty-6.1.26-patched-JETTY-1340.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/lib/jetty-6.1.26-patched-JETTY-1340.jar?rev=1074713&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/lib/jetty-6.1.26-patched-JETTY-1340.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/lib/jetty-util-6.1.26-patched-JETTY-1340.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/lib/jetty-util-6.1.26-patched-JETTY-1340.jar?rev=1074713&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/lib/jetty-util-6.1.26-patched-JETTY-1340.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/lib/jsp-2.1-glassfish-2.1.v20091210.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/lib/jsp-2.1-glassfish-2.1.v20091210.jar?rev=1074713&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/lib/jsp-2.1-glassfish-2.1.v20091210.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/lib/jsp-2.1-jetty-6.1.26.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/lib/jsp-2.1-jetty-6.1.26.jar?rev=1074713&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/lib/jsp-2.1-jetty-6.1.26.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/lib/jsp-api-2.1-glassfish-2.1.v20091210.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/lib/jsp-api-2.1-glassfish-2.1.v20091210.jar?rev=1074713&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/lib/jsp-api-2.1-glassfish-2.1.v20091210.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream