Author: kwright
Date: Fri Sep 28 07:22:40 2012
New Revision: 1391340
URL: http://svn.apache.org/viewvc?rev=1391340&view=rev
Log:
Pull up fix for CONNECTORS-545 from trunk.
Modified:
manifoldcf/branches/release-1.0-branch/ (props changed)
manifoldcf/branches/release-1.0-branch/CHANGES.txt
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess-proprietary/properties.xml
Propchange: manifoldcf/branches/release-1.0-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1391338
Modified: manifoldcf/branches/release-1.0-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/CHANGES.txt?rev=1391340&r1=1391339&r2=1391340&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/CHANGES.txt Fri Sep 28 07:22:40 2012
@@ -3,6 +3,10 @@ $Id$
======================= 1.0 =====================
+CONNECTORS-545: web-proprietary wars need to be used by single-
+process proprietary example.
+(Shinichiro Abe, Karl Wright)
+
CONNECTORS-544: Add missing materials to combined service war.
Also include a way of easily invoking it from the single-process example
directory.
Modified:
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess-proprietary/properties.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/example-singleprocess-proprietary/properties.xml?rev=1391340&r1=1391339&r2=1391340&view=diff
==============================================================================
---
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess-proprietary/properties.xml
(original)
+++
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess-proprietary/properties.xml
Fri Sep 28 07:22:40 2012
@@ -18,13 +18,13 @@
<configuration>
<!-- Point to the wars and configure Jetty -->
- <property name="org.apache.manifoldcf.crawleruiwarpath"
value="../web/war/mcf-crawler-ui.war"/>
- <property name="org.apache.manifoldcf.authorityservicewarpath"
value="../web/war/mcf-authority-service.war"/>
- <property name="org.apache.manifoldcf.apiservicewarpath"
value="../web/war/mcf-api-service.war"/>
+ <property name="org.apache.manifoldcf.crawleruiwarpath"
value="../web-proprietary/war/mcf-crawler-ui.war"/>
+ <property name="org.apache.manifoldcf.authorityservicewarpath"
value="../web-proprietary/war/mcf-authority-service.war"/>
+ <property name="org.apache.manifoldcf.apiservicewarpath"
value="../web-proprietary/war/mcf-api-service.war"/>
<property name="org.apache.manifoldcf.usejettyparentclassloader"
value="true"/>
<property name="org.apache.manifoldcf.jettyport" value="8345"/>
<!-- Point to the combined war in case we start the single-process example
that way -->
- <property name="org.apache.manifoldcf.combinedwarpath"
value="../web/war/mcf-combined-service.war"/>
+ <property name="org.apache.manifoldcf.combinedwarpath"
value="../web-proprietary/war/mcf-combined-service.war"/>
<!-- Select Derby as the database implementation, and specify where the
database will be stored -->
<property name="org.apache.manifoldcf.databaseimplementationclass"
value="org.apache.manifoldcf.core.database.DBInterfaceDerby"/>
<property name="org.apache.manifoldcf.derbydatabasepath" value="."/>
