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 2012/02/11 13:02:54 UTC
svn commit: r1243040 - in /incubator/lcf/trunk: ./ framework/
framework/example-multiprocess-proprietary/ framework/example-multiprocess/
framework/example-singleprocess-proprietary/
framework/example-singleprocess/ site/src/documentation/content/xdocs...
Author: kwright
Date: Sat Feb 11 12:02:53 2012
New Revision: 1243040
URL: http://svn.apache.org/viewvc?rev=1243040&view=rev
Log:
Fix for CONNECTORS-327. Move webapps to a single directory that is shared among all examples.
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/build.xml
incubator/lcf/trunk/framework/build.xml
incubator/lcf/trunk/framework/example-multiprocess-proprietary/properties.xml
incubator/lcf/trunk/framework/example-multiprocess/properties.xml
incubator/lcf/trunk/framework/example-singleprocess-proprietary/properties.xml
incubator/lcf/trunk/framework/example-singleprocess/properties.xml
incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1243040&r1=1243039&r2=1243040&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Sat Feb 11 12:02:53 2012
@@ -3,6 +3,9 @@ $Id$
======================= 0.5-dev =====================
+CONNECTORS-327: Share the web applications among all the examples.
+(Karl Wright)
+
CONNECTORS-402: Change the ant build process to produce two artifacts -
one with proprietary material, and the other without. This allows for
releases that include built connectors even though we do not ship the
Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1243040&r1=1243039&r2=1243040&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Sat Feb 11 12:02:53 2012
@@ -923,6 +923,14 @@
</target>
<target name="deliver-framework" depends="preclean-for-delivery,build-framework">
+ <mkdir dir="dist/web"/>
+ <copy todir="dist/web">
+ <fileset dir="framework/dist/web"/>
+ </copy>
+ <mkdir dir="dist/web-proprietary"/>
+ <copy todir="dist/web-proprietary">
+ <fileset dir="framework/dist/web-proprietary"/>
+ </copy>
<mkdir dir="dist/multiprocess-example"/>
<copy todir="dist/multiprocess-example">
<fileset dir="framework/dist/multiprocess-example"/>
@@ -2198,6 +2206,7 @@
<exclude name="dist/connectors-proprietary.xml"/>
<exclude name="dist/example-proprietary/"/>
<exclude name="dist/multiprocess-example-proprietary/"/>
+ <exclude name="dist/web-proprietary/"/>
<exclude name="/apache-manifoldcf-*"/>
</zipfileset>
</zip>
@@ -2233,6 +2242,7 @@
<exclude name="dist/connectors-proprietary.xml"/>
<exclude name="dist/example-proprietary/"/>
<exclude name="dist/multiprocess-example-proprietary/"/>
+ <exclude name="dist/web-proprietary/"/>
<exclude name="/apache-manifoldcf-*"/>
</tarfileset>
</tar>
Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1243040&r1=1243039&r2=1243040&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Sat Feb 11 12:02:53 2012
@@ -513,14 +513,6 @@
</copy>
</target>
- <target name="example-common">
- <copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
- <copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
- <mkdir dir="dist/connector-lib"/>
- <mkdir dir="dist/connector-lib-proprietary"/>
- <copy file="example-common/README.txt" todir="dist/connector-lib-proprietary"/>
- </target>
-
<target name="war-authority-service" depends="webapp-authority-service">
<mkdir dir="build/war"/>
<war destfile="build/war/mcf-authority-service.war" webxml="authority-service/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/authority-service"/>
@@ -551,20 +543,28 @@
<war destfile="build/war-proprietary/mcf-crawler-ui.war" webxml="crawler-ui/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/crawler-ui-proprietary"/>
</target>
- <target name="multi-wars" depends="war-authority-service,war-api-service,war-crawler-ui">
- <mkdir dir="dist/multiprocess-example/web/war"/>
- <copy todir="dist/multiprocess-example/web/war">
+ <target name="wars" depends="war-authority-service,war-api-service,war-crawler-ui">
+ <mkdir dir="dist/web/war"/>
+ <copy todir="dist/web/war">
<fileset dir="build/war"/>
</copy>
</target>
- <target name="multi-wars-proprietary" depends="war-authority-service-proprietary,war-api-service-proprietary,war-crawler-ui-proprietary">
- <mkdir dir="dist/multiprocess-example-proprietary/web/war"/>
- <copy todir="dist/multiprocess-example-proprietary/web/war">
+ <target name="wars-proprietary" depends="war-authority-service-proprietary,war-api-service-proprietary,war-crawler-ui-proprietary">
+ <mkdir dir="dist/web-proprietary/war"/>
+ <copy todir="dist/web-proprietary/war">
<fileset dir="build/war-proprietary"/>
</copy>
</target>
+ <target name="example-common" depends="wars,wars-proprietary">
+ <copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
+ <copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
+ <mkdir dir="dist/connector-lib"/>
+ <mkdir dir="dist/connector-lib-proprietary"/>
+ <copy file="example-common/README.txt" todir="dist/connector-lib-proprietary"/>
+ </target>
+
<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">
@@ -652,7 +652,7 @@
<mkdir dir="dist/multiprocess-example-proprietary/syncharea"/>
</target>
- <target name="multi-process-example" depends="jar-core,jar-agents,jar-pull-agent,jar-jetty-runner,multi-wars,multi-processes">
+ <target name="multi-process-example" depends="jar-core,jar-agents,jar-pull-agent,jar-jetty-runner,multi-processes">
<mkdir dir="dist/multiprocess-example"/>
<copy todir="dist/multiprocess-example">
<fileset dir="example-multiprocess-common">
@@ -692,7 +692,7 @@
<mkdir dir="dist/multiprocess-example/logs"/>
</target>
- <target name="multi-process-example-proprietary" depends="jar-core,jar-agents,jar-pull-agent,jar-jetty-runner,multi-wars-proprietary,multi-processes-proprietary">
+ <target name="multi-process-example-proprietary" depends="jar-core,jar-agents,jar-pull-agent,jar-jetty-runner,multi-processes-proprietary">
<mkdir dir="dist/multiprocess-example-proprietary"/>
<copy todir="dist/multiprocess-example-proprietary">
<fileset dir="example-multiprocess-common">
@@ -759,7 +759,7 @@
</copy>
</target>
- <target name="single-process-example" depends="war-crawler-ui,war-api-service,war-authority-service,jar-jetty-runner,jar-core,jar-agents,jar-pull-agent">
+ <target name="single-process-example" depends="jar-jetty-runner,jar-core,jar-agents,jar-pull-agent">
<mkdir dir="dist/example/lib"/>
<copy todir="dist/example/lib">
<fileset dir="../build/jar">
@@ -802,10 +802,6 @@
<include name="mcf-jetty-runner.jar"/>
</fileset>
</copy>
- <mkdir dir="dist/example/war"/>
- <copy todir="dist/example/war">
- <fileset dir="build/war"/>
- </copy>
<mkdir dir="dist/example/logs"/>
<copy todir="dist/example">
<fileset dir="example-singleprocess-common">
@@ -881,7 +877,7 @@
</target>
- <target name="single-process-example-proprietary" depends="war-crawler-ui-proprietary,war-api-service-proprietary,war-authority-service-proprietary,jar-jetty-runner,jar-core,jar-agents,jar-pull-agent">
+ <target name="single-process-example-proprietary" depends="jar-jetty-runner,jar-core,jar-agents,jar-pull-agent">
<mkdir dir="dist/example-proprietary/lib"/>
<copy todir="dist/example-proprietary/lib">
<fileset dir="../build/jar">
@@ -929,10 +925,6 @@
<include name="mcf-jetty-runner.jar"/>
</fileset>
</copy>
- <mkdir dir="dist/example-proprietary/war"/>
- <copy todir="dist/example-proprietary/war">
- <fileset dir="build/war-proprietary"/>
- </copy>
<mkdir dir="dist/example-proprietary/logs"/>
<copy todir="dist/example-proprietary">
<fileset dir="example-singleprocess-common">
Modified: incubator/lcf/trunk/framework/example-multiprocess-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/example-multiprocess-proprietary/properties.xml?rev=1243040&r1=1243039&r2=1243040&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/example-multiprocess-proprietary/properties.xml (original)
+++ incubator/lcf/trunk/framework/example-multiprocess-proprietary/properties.xml Sat Feb 11 12:02:53 2012
@@ -18,9 +18,9 @@
<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="false"/>
<property name="org.apache.manifoldcf.jettyport" value="8345"/>
<!-- Point to the synchronization area -->
Modified: incubator/lcf/trunk/framework/example-multiprocess/properties.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/example-multiprocess/properties.xml?rev=1243040&r1=1243039&r2=1243040&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/example-multiprocess/properties.xml (original)
+++ incubator/lcf/trunk/framework/example-multiprocess/properties.xml Sat Feb 11 12:02:53 2012
@@ -18,9 +18,9 @@
<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/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.usejettyparentclassloader" value="false"/>
<property name="org.apache.manifoldcf.jettyport" value="8345"/>
<!-- Point to the synchronization area -->
Modified: incubator/lcf/trunk/framework/example-singleprocess-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/example-singleprocess-proprietary/properties.xml?rev=1243040&r1=1243039&r2=1243040&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/example-singleprocess-proprietary/properties.xml (original)
+++ incubator/lcf/trunk/framework/example-singleprocess-proprietary/properties.xml Sat Feb 11 12:02:53 2012
@@ -18,9 +18,9 @@
<configuration>
<!-- Point to the wars and configure Jetty -->
- <property name="org.apache.manifoldcf.crawleruiwarpath" value="./war/mcf-crawler-ui.war"/>
- <property name="org.apache.manifoldcf.authorityservicewarpath" value="./war/mcf-authority-service.war"/>
- <property name="org.apache.manifoldcf.apiservicewarpath" value="./war/mcf-api-service.war"/>
+ <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.usejettyparentclassloader" value="true"/>
<property name="org.apache.manifoldcf.jettyport" value="8345"/>
<!-- Select Derby as the database implementation, and specify where the database will be stored -->
Modified: incubator/lcf/trunk/framework/example-singleprocess/properties.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/example-singleprocess/properties.xml?rev=1243040&r1=1243039&r2=1243040&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/example-singleprocess/properties.xml (original)
+++ incubator/lcf/trunk/framework/example-singleprocess/properties.xml Sat Feb 11 12:02:53 2012
@@ -18,9 +18,9 @@
<configuration>
<!-- Point to the wars and configure Jetty -->
- <property name="org.apache.manifoldcf.crawleruiwarpath" value="./war/mcf-crawler-ui.war"/>
- <property name="org.apache.manifoldcf.authorityservicewarpath" value="./war/mcf-authority-service.war"/>
- <property name="org.apache.manifoldcf.apiservicewarpath" value="./war/mcf-api-service.war"/>
+ <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.usejettyparentclassloader" value="true"/>
<property name="org.apache.manifoldcf.jettyport" value="8345"/>
<!-- Select Derby as the database implementation, and specify where the database will be stored -->
Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1243040&r1=1243039&r2=1243040&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml Sat Feb 11 12:02:53 2012
@@ -88,6 +88,8 @@
<tr><td><em>example-proprietary</em></td><td>a jetty-based example that runs in a single process (except for any connector-specific processes), including proprietary libraries; not included in binary release</td></tr>
<tr><td><em>multiprocess-example</em></td><td>scripts and jars for an example that uses the multiple process model, excluding all proprietary libraries</td></tr>
<tr><td><em>multiprocess-example-proprietary</em></td><td>scripts and jars for an example that uses the multiple process model, including proprietary libraries; not included in binary release</td></tr>
+ <tr><td><em>web</em></td><td>app-server deployable web applications (wars), excluding all proprietary libraries</td></tr>
+ <tr><td><em>web-proprietary</em></td><td>app-server deployable web applications (wars), including proprietary libraries; not included in binary release</td></tr>
<tr><td><em>doc</em></td><td>javadocs for framework and all included connectors</td></tr>
<tr><td><em>xxx-integration</em></td><td>pre-built integration components to deploy on target system "xxx", e.g. Solr</td></tr>
</table>