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 2014/12/18 09:59:38 UTC
svn commit: r1646410 - in /manifoldcf/branches/release-2.0-branch: ./
CHANGES.txt framework/build.xml
Author: kwright
Date: Thu Dec 18 08:59:38 2014
New Revision: 1646410
URL: http://svn.apache.org/r1646410
Log:
Pull up fix for CONNECTORS-1124 from trunk
Modified:
manifoldcf/branches/release-2.0-branch/ (props changed)
manifoldcf/branches/release-2.0-branch/CHANGES.txt
manifoldcf/branches/release-2.0-branch/framework/build.xml
Propchange: manifoldcf/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 08:59:38 2014
@@ -119,4 +119,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646403
+/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403
Modified: manifoldcf/branches/release-2.0-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/CHANGES.txt?rev=1646410&r1=1646409&r2=1646410&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.0-branch/CHANGES.txt Thu Dec 18 08:59:38 2014
@@ -3,6 +3,9 @@ $Id$
======================= Release 2.0 =====================
+CONNECTORS-1124: start.jar in example-proprietary not working.
+(Shinichiro Abe, Karl Wright)
+
CONNECTORS-1125: Make sure xz jar is delivered to where Tika needs
it.
(Kamil Żyta, Karl Wright)
Modified: manifoldcf/branches/release-2.0-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/build.xml?rev=1646410&r1=1646409&r2=1646410&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-2.0-branch/framework/build.xml Thu Dec 18 08:59:38 2014
@@ -1614,7 +1614,7 @@
<mkdir dir="build/example-proprietary"/>
<manifest file="build/example-proprietary/manifest">
<attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
- <attribute name="Class-Path" value="../lib/mcf-core.jar ../lib/mcf-agents.jar ../lib/mcf-pull-agent.jar ../lib/mcf-ui-core.jar ../lib/mcf-jetty-runner.jar ${database-lib-manifest} ${process-manifest-cp} ${jetty-manifest-cp} ${process-manifest-cp-proprietary}"/>
+ <attribute name="Class-Path" value="../lib/mcf-core.jar ../lib/mcf-agents.jar ../lib/mcf-pull-agent.jar ../lib/mcf-ui-core.jar ../lib/mcf-jetty-runner.jar ${database-manifest-cp} ${process-manifest-cp} ${jetty-manifest-cp} ${process-manifest-cp-proprietary}"/>
</manifest>
<jar destfile="dist/example-proprietary/start.jar" manifest="build/example-proprietary/manifest"/>
</target>