Author: kwright
Date: Thu Sep 27 17:11:09 2012
New Revision: 1391104
URL: http://svn.apache.org/viewvc?rev=1391104&view=rev
Log:
Pull up fix for CONNECTORS-544 from trunk.
Added:
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess-common/setclasspath.bat
- copied unchanged from r1391101,
manifoldcf/trunk/framework/example-singleprocess-common/setclasspath.bat
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess-common/start-combined.bat
- copied unchanged from r1391101,
manifoldcf/trunk/framework/example-singleprocess-common/start-combined.bat
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess-common/start-combined.sh
- copied unchanged from r1391101,
manifoldcf/trunk/framework/example-singleprocess-common/start-combined.sh
manifoldcf/branches/release-1.0-branch/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
- copied unchanged from r1391101,
manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
Modified:
manifoldcf/branches/release-1.0-branch/ (props changed)
manifoldcf/branches/release-1.0-branch/CHANGES.txt
manifoldcf/branches/release-1.0-branch/framework/build.xml
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess-proprietary/properties.xml
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess/properties.xml
Propchange: manifoldcf/branches/release-1.0-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1391101
Modified: manifoldcf/branches/release-1.0-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/CHANGES.txt?rev=1391104&r1=1391103&r2=1391104&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/CHANGES.txt Thu Sep 27 17:11:09 2012
@@ -3,6 +3,11 @@ $Id$
======================= 1.0 =====================
+CONNECTORS-544: Add missing materials to combined service war.
+Also include a way of easily invoking it from the single-process example
+directory.
+(Karl Wright)
+
CONNECTORS-540: Multi-process proprietary webapps run not properly
running the start-webapps.sh.
(Shinichiro Abe)
Modified: manifoldcf/branches/release-1.0-branch/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/build.xml?rev=1391104&r1=1391103&r2=1391104&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-1.0-branch/framework/build.xml Thu Sep 27
17:11:09 2012
@@ -556,7 +556,7 @@
<jar
destfile="build/webapp/crawler-ui-proprietary/WEB-INF/lib/mcf-crawler-ui.jar"
basedir="build/crawler-ui/classes"/>
</target>
- <target name="webapp-combined-service"
depends="compile-combined-service,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
+ <target name="webapp-combined-service"
depends="compile-combined-service,jar-core,jar-ui-core,jar-agents,jar-pull-agent,jar-api-servlet,jar-authority-servlet">
<mkdir dir="build/webapp/combined-service/WEB-INF/lib"/>
<copy todir="build/webapp/combined-service/WEB-INF/lib">
<fileset dir="../lib">
@@ -587,6 +587,8 @@
<include name="mcf-agents.jar"/>
<include name="mcf-pull-agent.jar"/>
<include name="mcf-ui-core.jar"/>
+ <include name="mcf-api-servlet.jar"/>
+ <include name="mcf-authority-servlet.jar"/>
</fileset>
</copy>
<mkdir dir="build/webapp/combined-service/WEB-INF/jsp"/>
@@ -601,7 +603,7 @@
<jar
destfile="build/webapp/combined-service/WEB-INF/lib/mcf-combined-service.jar"
basedir="build/combined-service/classes"/>
</target>
- <target name="webapp-combined-service-proprietary"
depends="compile-combined-service,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
+ <target name="webapp-combined-service-proprietary"
depends="compile-combined-service,jar-core,jar-ui-core,jar-agents,jar-pull-agent,jar-api-servlet,jar-authority-servlet">
<mkdir dir="build/webapp/combined-service-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/combined-service-proprietary/WEB-INF/lib">
<fileset dir="../lib">
@@ -639,6 +641,8 @@
<include name="mcf-agents.jar"/>
<include name="mcf-pull-agent.jar"/>
<include name="mcf-ui-core.jar"/>
+ <include name="mcf-api-servlet.jar"/>
+ <include name="mcf-authority-servlet.jar"/>
</fileset>
</copy>
<mkdir dir="build/webapp/combined-service-proprietary/WEB-INF/jsp"/>
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=1391104&r1=1391103&r2=1391104&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
Thu Sep 27 17:11:09 2012
@@ -23,6 +23,8 @@
<property name="org.apache.manifoldcf.apiservicewarpath"
value="../web/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"/>
<!-- 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="."/>
Modified:
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess/properties.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/example-singleprocess/properties.xml?rev=1391104&r1=1391103&r2=1391104&view=diff
==============================================================================
---
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess/properties.xml
(original)
+++
manifoldcf/branches/release-1.0-branch/framework/example-singleprocess/properties.xml
Thu Sep 27 17:11:09 2012
@@ -23,6 +23,8 @@
<property name="org.apache.manifoldcf.apiservicewarpath"
value="../web/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"/>
<!-- 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="."/>
