Author: kwright
Date: Sun Sep 28 22:05:48 2014
New Revision: 1628106
URL: http://svn.apache.org/r1628106
Log:
Fix for CONNECTORS-1051.
Added:
manifoldcf/trunk/connectors/cmis/test-materials/ (with props)
manifoldcf/trunk/connectors/cmis/test-materials/README.txt (with props)
manifoldcf/trunk/connectors/elasticsearch/test-materials/
- copied from r1628065,
manifoldcf/trunk/connectors/elasticsearch/test-materials-proprietary/
Removed:
manifoldcf/trunk/connectors/elasticsearch/test-materials-proprietary/
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/cmis/build.xml
manifoldcf/trunk/connectors/elasticsearch/build.xml
manifoldcf/trunk/connectors/jcifs/lib-proprietary/ (props changed)
manifoldcf/trunk/lib-proprietary/ (props changed)
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1628106&r1=1628105&r2=1628106&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sun Sep 28 22:05:48 2014
@@ -3,6 +3,10 @@ $Id$
======================= 2.0-dev =====================
+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)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1628106&r1=1628105&r2=1628106&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sun Sep 28 22:05:48 2014
@@ -439,19 +439,23 @@
<exclude name="connectors/*/dist/"/>
<exclude name="framework/dist/"/>
<exclude name="**/target/"/>
+ <exclude name="**/test-materials/*.jar"/>
+ <exclude name="**/test-materials/*.war"/>
+ <exclude name="**/test-materials/*.wsdl"/>
+ <exclude name="**/test-materials/*.xsd"/>
+ <exclude name="**/test-materials-proprietary/*.jar"/>
+ <exclude name="**/test-materials-proprietary/*.war"/>
+ <exclude name="**/test-materials-proprietary/*.wsdl"/>
+ <exclude name="**/test-materials-proprietary/*.xsd"/>
<exclude name="**/test-output/"/>
<exclude name="**/test-postgresql-output/"/>
<exclude name="**/test-HSQLDB-output/"/>
<exclude name="**/test-HSQLDBext-output/"/>
<exclude name="**/test-mysql-output/"/>
<exclude name="**/lib-proprietary/*.jar"/>
- <exclude name="**/test-materials-proprietary/*.jar"/>
<exclude name="**/lib-proprietary/*.war"/>
- <exclude name="**/test-materials-proprietary/*.war"/>
<exclude name="**/lib-proprietary/*.wsdl"/>
- <exclude name="**/test-materials-proprietary/*.wsdl"/>
<exclude name="**/lib-proprietary/*.xsd"/>
- <exclude name="**/test-materials-proprietary/*.xsd"/>
<exclude
name="connectors/elasticsearch/test-materials-proprietary/elasticsearch-1.0.1/"/>
<exclude name="legacy-*/"/>
<exclude name="apache-manifoldcf-*/"/>
@@ -483,14 +487,18 @@
<exclude name="**/test-HSQLDB-output/"/>
<exclude name="**/test-HSQLDBext-output/"/>
<exclude name="**/test-mysql-output/"/>
- <exclude name="**/lib-proprietary/*.jar"/>
+ <exclude name="**/test-materials/*.jar"/>
+ <exclude name="**/test-materials/*.war"/>
+ <exclude name="**/test-materials/*.wsdl"/>
+ <exclude name="**/test-materials/*.xsd"/>
<exclude name="**/test-materials-proprietary/*.jar"/>
- <exclude name="**/lib-proprietary/*.war"/>
<exclude name="**/test-materials-proprietary/*.war"/>
- <exclude name="**/lib-proprietary/*.wsdl"/>
<exclude name="**/test-materials-proprietary/*.wsdl"/>
- <exclude name="**/lib-proprietary/*.xsd"/>
<exclude name="**/test-materials-proprietary/*.xsd"/>
+ <exclude name="**/lib-proprietary/*.jar"/>
+ <exclude name="**/lib-proprietary/*.war"/>
+ <exclude name="**/lib-proprietary/*.wsdl"/>
+ <exclude name="**/lib-proprietary/*.xsd"/>
<exclude
name="connectors/elasticsearch/test-materials-proprietary/elasticsearch-1.0.1/"/>
<exclude name="legacy-*/"/>
<exclude name="apache-manifoldcf-*/"/>
@@ -1118,10 +1126,6 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name"
value="chemistry-opencmis-commons-api"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${chemistry-package}"/><param name="artifact-version"
value="${chemistry.version}"/><param name="target" value="lib"/>
- <param name="artifact-name"
value="chemistry-opencmis-server-inmemory"/>
- <param name="artifact-type" value="war"/>
- </antcall>
</target>
<target name="download-glassfish">
Modified: manifoldcf/trunk/connectors/cmis/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/build.xml?rev=1628106&r1=1628105&r2=1628106&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/build.xml (original)
+++ manifoldcf/trunk/connectors/cmis/build.xml Sun Sep 28 22:05:48 2014
@@ -30,8 +30,30 @@
<import file="${mcf-dist}/connector-build.xml"/>
- <property name="cmis.version" value="0.11.0"/>
+ <property name="chemistry.version" value="0.11.0"/>
+ <target name="download-dependencies">
+ <property name="chemistry-package"
value="org/apache/chemistry/opencmis"/>
+ <antcall target="download-via-maven"><param name="project-path"
value="${chemistry-package}"/><param name="artifact-version"
value="${chemistry.version}"/><param name="target" value="test-materials"/>
+ <param name="artifact-name"
value="chemistry-opencmis-server-inmemory"/>
+ <param name="artifact-type" value="war"/>
+ </antcall>
+ </target>
+
+ <target name="download-cleanup">
+ <delete>
+ <fileset dir="test-materials" excludes="README*.txt"/>
+ </delete>
+ </target>
+
+ <target name="calculate-testcode-condition">
+ <available
file="test-materials/chemistry-opencmis-server-inmemory-${chemistry.version}.war"
property="tests-present"/>
+ </target>
+
+ <target name="pretest-warn" depends="calculate-testcode-condition"
unless="tests-present">
+ <echo message="Need Apache Chemistry in-memory war download in order
to run tests - run ant make-deps"/>
+ </target>
+
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
<fileset dir="../../lib">
@@ -76,9 +98,6 @@
</antcall>
</target>
- <!-- Note: We need to fix the war path; it refers directly to the lib
directory.
- Instead, we need to have each connector be responsible for
downloading its test materials,
- so that the main framework dist does not need to include it. MHL -->
<target name="run-IT-HSQLDB" depends="compile-tests,pretest-check"
if="canTest">
<mkdir dir="test-HSQLDB-output"/>
<junit fork="true" maxmemory="256m" dir="test-HSQLDB-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -86,7 +105,7 @@
<jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
<jvmarg
value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
<jvmarg
value="-DcombinedWarPath=${mcf-dist}/web/war/mcf-combined-service.war"/>
- <jvmarg
value="-DopenCmisServerWarPath=../../../lib/chemistry-opencmis-server-inmemory-${cmis.version}.war"/>
+ <jvmarg
value="-DopenCmisServerWarPath=../test-materials/chemistry-opencmis-server-inmemory-${chemistry.version}.war"/>
<jvmarg value="-Xms128m"/>
<jvmarg value="-Xmx256m"/>
<classpath>
Propchange: manifoldcf/trunk/connectors/cmis/test-materials/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 28 22:05:48 2014
@@ -0,0 +1,4 @@
+*.jar
+*.war
+*.wsdl
+*.xsd
Added: manifoldcf/trunk/connectors/cmis/test-materials/README.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/test-materials/README.txt?rev=1628106&view=auto
==============================================================================
--- manifoldcf/trunk/connectors/cmis/test-materials/README.txt (added)
+++ manifoldcf/trunk/connectors/cmis/test-materials/README.txt Sun Sep 28
22:05:48 2014
@@ -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 Apache Chemistry in-memory war file into
+lthis 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: manifoldcf/trunk/connectors/cmis/test-materials/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: manifoldcf/trunk/connectors/elasticsearch/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/build.xml?rev=1628106&r1=1628105&r2=1628106&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/build.xml (original)
+++ manifoldcf/trunk/connectors/elasticsearch/build.xml Sun Sep 28 22:05:48 2014
@@ -38,28 +38,28 @@
<get
src="http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${elasticsearch.version}.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"/>
+ <untar src="build/download/elasticsearch.tar" dest="test-materials"/>
<!-- download and install the attachment plugin -->
- <mkdir
dir="test-materials-proprietary/elasticsearch-${elasticsearch.version}/plugins"/>
+ <mkdir
dir="test-materials/elasticsearch-${elasticsearch.version}/plugins"/>
<get
src="https://github.com/elasticsearch/elasticsearch-mapper-attachments/archive/v2.0.0.RC1.zip";
-
dest="test-materials-proprietary/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"/>
+
dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"/>
- <unzip
src="test-materials-proprietary/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"
dest="test-materials-proprietary/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments"/>
+ <unzip
src="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"
dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments"/>
- <chmod
dir="test-materials-proprietary/elasticsearch-${elasticsearch.version}"
perm="ugo+rxw">
+ <chmod dir="test-materials/elasticsearch-${elasticsearch.version}"
perm="ugo+rxw">
<fileset dir="**/*"/>
</chmod>
- <chmod
file="test-materials-proprietary/elasticsearch-${elasticsearch.version}/bin/plugin"
perm="ugo+rx"/>
- <chmod
file="test-materials-proprietary/elasticsearch-${elasticsearch.version}/bin/elasticsearch"
perm="ugo+rx"/>
- <chmod
file="test-materials-proprietary/elasticsearch-${elasticsearch.version}/bin/elasticsearch.in.sh"
perm="ugo+rx"/>
+ <chmod
file="test-materials/elasticsearch-${elasticsearch.version}/bin/plugin"
perm="ugo+rx"/>
+ <chmod
file="test-materials/elasticsearch-${elasticsearch.version}/bin/elasticsearch"
perm="ugo+rx"/>
+ <chmod
file="test-materials/elasticsearch-${elasticsearch.version}/bin/elasticsearch.in.sh"
perm="ugo+rx"/>
</target>
<target name="download-cleanup">
<delete>
- <fileset dir="test-materials-proprietary" excludes="README*.txt"/>
+ <fileset dir="test-materials" excludes="README*.txt"/>
</delete>
</target>
@@ -71,7 +71,7 @@
</target>
<target name="calculate-testcode-condition">
- <available
file="test-materials-proprietary/elasticsearch-${elasticsearch.version}"
property="tests-present"/>
+ <available
file="test-materials/elasticsearch-${elasticsearch.version}"
property="tests-present"/>
</target>
<target name="pretest-warn" depends="calculate-testcode-condition"
unless="tests-present">
@@ -80,7 +80,7 @@
<path id="connector-test-classpath">
<path refid="mcf-connector-build.connector-test-classpath"/>
- <fileset
dir="test-materials-proprietary/elasticsearch-${elasticsearch.version}">
+ <fileset dir="test-materials/elasticsearch-${elasticsearch.version}">
<include name="lib/*.jar"/>
<include name="plugins/mapper-attachments/*.jar"/>
</fileset>
Propchange: manifoldcf/trunk/connectors/jcifs/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 28 22:05:48 2014
@@ -1 +1,4 @@
-jcifs.jar
+*.jar
+*.war
+*.wsdl
+*.xsd
Propchange: manifoldcf/trunk/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 28 22:05:48 2014
@@ -1,3 +1,4 @@
-jtds.jar
-mysql-connector-java.jar
-ojdbc.jar
+*.jar
+*.war
+*.wsdl
+*.xsd
