Author: kwright
Date: Tue Oct 14 12:09:05 2014
New Revision: 1631727
URL: http://svn.apache.org/r1631727
Log:
Pull up the following build-related revisions from trunk: 1627687, 1627690, 1627959, 1628066, 1628106, 1628168, 1628188, 1628699, 1628798, 1628808, 1628845, 1628905, 1629122, 1629374, 1629541. This basically brings dev_1x into compliance with all the build-related changes on trunk as of this date.
Added:
manifoldcf/branches/dev_1x/connectors/cmis/test-materials/
- copied from r1628106, manifoldcf/trunk/connectors/cmis/test-materials/
manifoldcf/branches/dev_1x/connectors/elasticsearch/test-materials/
- copied from r1628106, manifoldcf/trunk/connectors/elasticsearch/test-materials/
manifoldcf/branches/dev_1x/framework/example-multiprocess-common/jetty.xml
- copied unchanged from r1628808, manifoldcf/trunk/framework/example-multiprocess-common/jetty.xml
manifoldcf/branches/dev_1x/framework/example-singleprocess-common/jetty.xml
- copied unchanged from r1628808, manifoldcf/trunk/framework/example-singleprocess-common/jetty.xml
manifoldcf/branches/dev_1x/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyShutdown.java
- copied unchanged from r1629122, manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyShutdown.java
manifoldcf/branches/dev_1x/framework/scripts-combined/stop-combined.bat
- copied unchanged from r1629122, manifoldcf/trunk/framework/scripts-combined/stop-combined.bat
manifoldcf/branches/dev_1x/framework/scripts-combined/stop-combined.sh
- copied unchanged from r1629122, manifoldcf/trunk/framework/scripts-combined/stop-combined.sh
manifoldcf/branches/dev_1x/framework/scripts-hsqldb/
- copied from r1627959, manifoldcf/trunk/framework/scripts-hsqldb/
manifoldcf/branches/dev_1x/framework/scripts-start/
- copied from r1628168, manifoldcf/trunk/framework/scripts-start/
manifoldcf/branches/dev_1x/framework/scripts-start/stop.bat
- copied unchanged from r1629122, manifoldcf/trunk/framework/scripts-start/stop.bat
manifoldcf/branches/dev_1x/framework/scripts-start/stop.sh
- copied unchanged from r1629122, manifoldcf/trunk/framework/scripts-start/stop.sh
manifoldcf/branches/dev_1x/framework/scripts-zookeeper/
- copied from r1627959, manifoldcf/trunk/framework/scripts-zookeeper/
Removed:
manifoldcf/branches/dev_1x/connectors/elasticsearch/test-materials-proprietary/
manifoldcf/branches/dev_1x/framework/example-multiprocess-common/start-database.bat
manifoldcf/branches/dev_1x/framework/example-multiprocess-common/start-database.sh
manifoldcf/branches/dev_1x/framework/example-multiprocess-zk-common/runzookeeper.bat
manifoldcf/branches/dev_1x/framework/example-multiprocess-zk-common/runzookeeper.sh
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/build.xml
manifoldcf/branches/dev_1x/common-build.xml
manifoldcf/branches/dev_1x/connectors/alfresco/build.xml
manifoldcf/branches/dev_1x/connectors/alfresco/pom.xml
manifoldcf/branches/dev_1x/connectors/cmis/build.xml
manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.bat
manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.sh
manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/setclasspath.bat
manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.bat
manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.sh
manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/setclasspath.bat
manifoldcf/branches/dev_1x/connectors/elasticsearch/build.xml
manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.bat
manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.sh
manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/setclasspath.bat
manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.bat
manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.sh
manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/setclasspath.bat
manifoldcf/branches/dev_1x/connectors/jcifs/build.xml
manifoldcf/branches/dev_1x/connectors/jcifs/lib-proprietary/ (props changed)
manifoldcf/branches/dev_1x/connectors/rss/ (props changed)
manifoldcf/branches/dev_1x/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java
manifoldcf/branches/dev_1x/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java
manifoldcf/branches/dev_1x/connectors/tika/build.xml
manifoldcf/branches/dev_1x/connectors/tika/pom.xml
manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java
manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java
manifoldcf/branches/dev_1x/connectors/wiki/ (props changed)
manifoldcf/branches/dev_1x/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java
manifoldcf/branches/dev_1x/dist-license/LICENSE.txt
manifoldcf/branches/dev_1x/framework/ (props changed)
manifoldcf/branches/dev_1x/framework/api-service/pom.xml
manifoldcf/branches/dev_1x/framework/api-servlet/pom.xml
manifoldcf/branches/dev_1x/framework/authority-service/pom.xml
manifoldcf/branches/dev_1x/framework/authority-servlet/pom.xml
manifoldcf/branches/dev_1x/framework/build.xml
manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml
manifoldcf/branches/dev_1x/framework/combined-service/pom.xml
manifoldcf/branches/dev_1x/framework/combined-service/src/main/webapp/WEB-INF/web.xml
manifoldcf/branches/dev_1x/framework/core/pom.xml
manifoldcf/branches/dev_1x/framework/crawler-ui/pom.xml
manifoldcf/branches/dev_1x/framework/example-multiprocess-file-proprietary/properties.xml
manifoldcf/branches/dev_1x/framework/example-multiprocess-file/properties.xml
manifoldcf/branches/dev_1x/framework/example-multiprocess-zk-proprietary/properties.xml
manifoldcf/branches/dev_1x/framework/example-multiprocess-zk/properties.xml
manifoldcf/branches/dev_1x/framework/example-singleprocess-proprietary/properties.xml
manifoldcf/branches/dev_1x/framework/example-singleprocess/properties.xml
manifoldcf/branches/dev_1x/framework/jetty-runner/pom.xml
manifoldcf/branches/dev_1x/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
manifoldcf/branches/dev_1x/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
manifoldcf/branches/dev_1x/framework/scripts-combined/combined-options.env.unix
manifoldcf/branches/dev_1x/framework/scripts-combined/combined-options.env.win
manifoldcf/branches/dev_1x/framework/scripts-jetty/jetty-options.env.unix
manifoldcf/branches/dev_1x/framework/scripts-jetty/jetty-options.env.win
manifoldcf/branches/dev_1x/framework/scripts-start/start-options.env.unix
manifoldcf/branches/dev_1x/framework/scripts-start/start-options.env.win
manifoldcf/branches/dev_1x/framework/ui-core/pom.xml
manifoldcf/branches/dev_1x/lib-license/LICENSE.txt
manifoldcf/branches/dev_1x/lib-proprietary/ (props changed)
manifoldcf/branches/dev_1x/pom.xml
manifoldcf/branches/dev_1x/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
manifoldcf/branches/dev_1x/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
manifoldcf/branches/dev_1x/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1048:r1627756-1627957
Merged /manifoldcf/trunk:r1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374,1629541
Merged /manifoldcf/branches/CONNECTORS-1050:r1628142-1628796
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1631727&r1=1631726&r2=1631727&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Tue Oct 14 12:09:05 2014
@@ -3,6 +3,30 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1053: Provide stop scripts for single-process examples.
+(Shinichiro Abe, Karl Wright)
+
+CONNECTORS-345: Provide a jetty configuration XML file that can
+be used to alter the jetty configuration.
+(Shinichiro Abe, Karl Wright)
+
+CONNECTORS-1050: Upgrade to Jetty 9.
+(Shinichiro Abe)
+
+CONNECTORS-1049: Put plugins under "plugins" in dist directory,
+and connector processes under "processes" in dist directory.
+(Shinichiro Abe, Karl Wright)
+
+CONNECTORS-1051: Elastic Search connector and CMIS connector
+should use the same paradigm for test wars.
+(Karl Wright)
+
+CONNECTORS-1048: Use full paths for all downloaded jars.
+(Shinichiro Abe, Karl Wright)
+
+CONNECTORS-1047: Upgrade to Tika 1.6.
+(Shinichiro Abe)
+
CONNECTORS-1042: Upgrade solrj and zookeeper versions.
(Karl Wright)