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/24 00:07:59 UTC
svn commit: r1293018 - in /incubator/lcf/branches/CONNECTORS-288: ./
connectors/elasticsearch/
connectors/elasticsearch/test-materials-proprietary/ tests/elasticsearch/
Author: kwright
Date: Thu Feb 23 23:07:59 2012
New Revision: 1293018
URL: http://svn.apache.org/viewvc?rev=1293018&view=rev
Log:
Get the ant tests being called correctly for elasticsearch.
Added:
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/README.txt (with props)
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/test-materials-proprietary/ (with props)
Modified:
incubator/lcf/branches/CONNECTORS-288/build.xml
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/ (props changed)
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/build.xml
incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/ (props changed)
incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml
Modified: incubator/lcf/branches/CONNECTORS-288/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/build.xml?rev=1293018&r1=1293017&r2=1293018&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-288/build.xml Thu Feb 23 23:07:59 2012
@@ -66,6 +66,9 @@
<ant dir="tests/sharepoint" target="clean"/>
<ant dir="tests/webcrawler" target="clean"/>
<ant dir="tests/wiki" target="clean"/>
+ <ant dir="tests/elasticsearch" target="clean"/>
+
+ <ant dir="test-materials/elasticsearch-server" target="clean"/>
</target>
@@ -1497,18 +1500,30 @@
<param name="connector-name" value="opensearchserver"/>
</antcall>
</target>
-
+
+
<target name="calculate-elasticsearch-condition" depends="build-elasticsearch-connector">
<available file="connectors/elasticsearch/dist/lib" type="dir" property="elasticsearch.exists"/>
<condition property="elasticsearch.include">
<isset property="elasticsearch.exists"/>
</condition>
</target>
-
- <target name="calculate-elasticsearch-tests-condition" depends="calculate-elasticsearch-condition,calculate-cmis-condition">
+
+ <target name="calculate-elasticsearch-testmaterials-condition" depends="calculate-elasticsearch-condition">
+ <available file="connectors/elasticsearch/test-materials-proprietary/elasticsearch-0.18.7" type="dir" property="elasticsearch-testmaterials.exists"/>
+ <condition property="elasticsearch-testmaterials.include">
+ <and>
+ <isset property="elasticsearch-testmaterials.exists"/>
+ <isset property="elasticsearch.include"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="calculate-elasticsearch-tests-condition" depends="calculate-elasticsearch-testmaterials-condition,calculate-elasticsearch-condition,calculate-cmis-condition">
<condition property="elasticsearch-tests.include">
<and>
<isset property="elasticsearch.include"/>
+ <isset property="elasticsearch-testmaterials.include"/>
<isset property="cmis.include"/>
</and>
</condition>
@@ -2372,6 +2387,7 @@ Use Apache Forrest version forrest-0.9-d
<ant dir="connectors/jcifs" target="download-dependencies"/>
<ant dir="connectors/sharepoint" target="download-dependencies"/>
<ant dir="connectors/alfresco" target="download-dependencies"/>
+ <ant dir="connectors/elasticsearch" target="download-dependencies"/>
<ant dir="site" target="download-dependencies"/>
</target>
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 23 23:07:59 2012
@@ -0,0 +1,10 @@
+build
+dist
+doc
+target
+test-output
+test-derby-output
+test-postgresql-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-mysql-output
Added: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/README.txt?rev=1293018&view=auto
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/README.txt (added)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/README.txt Thu Feb 23 23:07:59 2012
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+To test this connector, copy the contents of the unpacked elastic search binary's
+lib folder into this directory, and use the "ant test" target for the standard ant build.
+You can read more about the process on the "how-to-build-and-deploy.html"
+documentation page.
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/README.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/build.xml?rev=1293018&r1=1293017&r2=1293018&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/build.xml Thu Feb 23 23:07:59 2012
@@ -19,4 +19,11 @@
<import file="../connector-build.xml"/>
+ <target name="download-dependencies">
+ <mkdir dir="build/download"/>
+ <get src="http://cloud.github.com/downloads/elasticsearch/elasticsearch/elasticsearch-0.18.7.tar.gz" dest="build/download/elasticsearch.tar.gz"/>
+ <gunzip src="build/download/elasticsearch.tar.gz"/>
+ <untar src="build/download/elasticsearch.tar" dest="test-materials-proprietary"/>
+ </target>
+
</project>
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/test-materials-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 23 23:07:59 2012
@@ -0,0 +1 @@
+elasticsearch*
Propchange: incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 23 23:07:59 2012
@@ -0,0 +1,7 @@
+target
+build
+test-derby-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-postgresql-output
+test-mysql-output
Modified: incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml?rev=1293018&r1=1293017&r2=1293018&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml Thu Feb 23 23:07:59 2012
@@ -17,42 +17,49 @@
<project name="elasticsearch" default="all">
- <import file="../icmis-test-build.xml"/>
-
- <target name="run-derby" depends="compile-tests">
- <mkdir dir="test-derby-output"/>
- <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
- <jvmarg value="-DcrawlerWarPath=../../../framework/build/war/mcf-crawler-ui.war"/>
- <jvmarg value="-DauthorityserviceWarPath=../../../framework/build/war/mcf-authority-service.war"/>
- <jvmarg value="-DapiWarPath=../../../framework/build/war/mcf-api-service.war"/>
- <jvmarg value="-DopenCmisServerWarPath=../../../lib/chemistry-opencmis-server-inmemory.war"/>
- <classpath>
- <path refid="test-classpath"/>
- <pathelement location="build/test/classes"/>
- </classpath>
- <formatter type="brief" usefile="false"/>
+ <import file="../icmis-test-build.xml"/>
+
+ <path id="test-classpath">
+ <path refid="mcf-icmis-test-build.test-classpath"/>
+ <fileset dir="../../connectors/elasticsearch/test-materials-proprietary">
+ <include name="elasticsearch*/lib/*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="run-derby" depends="compile-tests">
+ <mkdir dir="test-derby-output"/>
+ <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+ <jvmarg value="-DcrawlerWarPath=../../../framework/build/war/mcf-crawler-ui.war"/>
+ <jvmarg value="-DauthorityserviceWarPath=../../../framework/build/war/mcf-authority-service.war"/>
+ <jvmarg value="-DapiWarPath=../../../framework/build/war/mcf-api-service.war"/>
+ <jvmarg value="-DopenCmisServerWarPath=../../../lib/chemistry-opencmis-server-inmemory.war"/>
+ <classpath>
+ <path refid="test-classpath"/>
+ <pathelement location="build/test/classes"/>
+ </classpath>
+ <formatter type="brief" usefile="false"/>
- <test name="org.apache.manifoldcf.elasticsearch_tests.APISanityIT" todir="test-derby-output"/>
+ <test name="org.apache.manifoldcf.elasticsearch_tests.APISanityIT" todir="test-derby-output"/>
- </junit>
- </target>
+ </junit>
+ </target>
- <target name="run-UI-derby" depends="compile-tests">
- <mkdir dir="test-derby-output"/>
- <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
- <jvmarg value="-DcrawlerWarPath=../../../framework/build/war/mcf-crawler-ui.war"/>
- <jvmarg value="-DauthorityserviceWarPath=../../../framework/build/war/mcf-authority-service.war"/>
- <jvmarg value="-DapiWarPath=../../../framework/build/war/mcf-api-service.war"/>
- <jvmarg value="-DopenCmisServerWarPath=../../../lib/chemistry-opencmis-server-inmemory.war"/>
- <classpath>
- <path refid="test-classpath"/>
- <pathelement location="build/test/classes"/>
- </classpath>
- <formatter type="brief" usefile="false"/>
+ <target name="run-UI-derby" depends="compile-tests">
+ <mkdir dir="test-derby-output"/>
+ <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+ <jvmarg value="-DcrawlerWarPath=../../../framework/build/war/mcf-crawler-ui.war"/>
+ <jvmarg value="-DauthorityserviceWarPath=../../../framework/build/war/mcf-authority-service.war"/>
+ <jvmarg value="-DapiWarPath=../../../framework/build/war/mcf-api-service.war"/>
+ <jvmarg value="-DopenCmisServerWarPath=../../../lib/chemistry-opencmis-server-inmemory.war"/>
+ <classpath>
+ <path refid="test-classpath"/>
+ <pathelement location="build/test/classes"/>
+ </classpath>
+ <formatter type="brief" usefile="false"/>
- <test name="org.apache.manifoldcf.elasticsearch_tests.NavigationDerbyUI" todir="test-derby-output"/>
+ <test name="org.apache.manifoldcf.elasticsearch_tests.NavigationDerbyUI" todir="test-derby-output"/>
- </junit>
- </target>
+ </junit>
+ </target>
</project>