manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1613081 - in /manifoldcf/branches/CONNECTORS-856-2: ./ connectors/solr/ connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/ framework/ framework/buildfiles/ lib-license/
Date Thu, 24 Jul 2014 11:56:45 GMT
Author: kwright
Date: Thu Jul 24 11:56:44 2014
New Revision: 1613081

URL: http://svn.apache.org/r1613081
Log:
Pull up changes from the CONNECTORS-856 branch

Added:
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java
      - copied unchanged from r1603322, manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java
      - copied unchanged from r1603322, manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/SolrConnectorTest.java
      - copied unchanged from r1603322, manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/SolrConnectorTest.java
Modified:
    manifoldcf/branches/CONNECTORS-856-2/   (props changed)
    manifoldcf/branches/CONNECTORS-856-2/build.xml
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml
    manifoldcf/branches/CONNECTORS-856-2/framework/build.xml
    manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml
    manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt
    manifoldcf/branches/CONNECTORS-856-2/pom.xml

Propchange: manifoldcf/branches/CONNECTORS-856-2/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-856-2:r1558363-1558366,1567646-1567672,1583896-1583905,1601642-1601647,1603319-1603322
  Merged /manifoldcf/branches/CONNECTORS-856:r1557893-1558363,1558367-1567648,1601648-1603320,1603323-1613079

Modified: manifoldcf/branches/CONNECTORS-856-2/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/build.xml?rev=1613081&r1=1613080&r2=1613081&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/build.xml Thu Jul 24 11:56:44 2014
@@ -1201,6 +1201,72 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
+
+    <target name="download-mock">
+        <mkdir dir="lib"/>
+        <property name="powermock-version" value="1.5.2"/>
+        <property name="powermock-package" value="org/powermock"/>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-module-junit4"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-api-mockito"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-api-support"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-core"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-reflect"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-module-junit4-common"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/mockito"/>
+            <param name="artifact-version" value="1.9.5"/>
+            <param name="artifact-name" value="mockito-all"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/noggit"/>
+            <param name="artifact-version" value="0.5"/>
+            <param name="artifact-name" value="noggit"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/javassist"/>
+            <param name="artifact-version" value="3.18.0-GA"/>
+            <param name="artifact-name" value="javassist"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/objenesis"/>
+            <param name="artifact-version" value="1.2"/>
+            <param name="artifact-name" value="objenesis"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
     
     <target name="download-junit">
         <mkdir dir="lib"/>
@@ -1211,7 +1277,7 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
-    
+
     <target name="download-log4j">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
@@ -1802,7 +1868,7 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
 	
-    <target name="make-core-deps" depends="download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,do
 wnload-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+    <target name="make-core-deps" depends="download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-mock,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,downloa
 d-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Modified: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml?rev=1613081&r1=1613080&r2=1613081&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml Thu Jul 24 11:56:44 2014
@@ -230,6 +230,18 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+      <dependency>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-module-junit4</artifactId>
+          <version>${powerMock.version}</version>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-api-mockito</artifactId>
+          <version>${powerMock.version}</version>
+          <scope>test</scope>
+      </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: manifoldcf/branches/CONNECTORS-856-2/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/framework/build.xml?rev=1613081&r1=1613080&r2=1613081&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/framework/build.xml Thu Jul 24 11:56:44 2014
@@ -59,7 +59,6 @@
             <include name="slf4j*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
-            <include name="junit*.jar"/>
             <include name="log4j*.jar"/>
             <include name="serializer*.jar"/>
             <include name="servlet-api*.jar"/>
@@ -82,6 +81,22 @@
         </fileset>
 
     </path>
+
+    <path id="framework-test-classpath">
+        <path refid="framework-classpath"/>
+        <fileset dir="../lib">
+            <include name="junit*.jar"/>
+            <include name="powermock-module-junit4*.jar"/>
+            <include name="powermock-core*.jar"/>
+            <include name="powermock-reflect*.jar"/>
+            <include name="powermock-api-support*.jar"/>
+            <include name="powermock-api-mockito*.jar"/>
+            <include name="mockito-all*.jar"/>
+            <include name="noggit*.jar"/>
+            <include name="javassist*.jar"/>
+            <include name="objenesis*.jar"/>
+        </fileset>
+    </path>
     
     <target name="doc">
         <mkdir dir="dist/doc"/>
@@ -1535,7 +1550,7 @@
         <mkdir dir="build/core-tests/classes"/>
         <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" deprecation="true"
target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
             </classpath>
         </javac>
@@ -1545,7 +1560,7 @@
         <mkdir dir="build/agents-tests/classes"/>
         <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" deprecation="true"
target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/core-tests/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1557,7 +1572,7 @@
         <mkdir dir="build/pull-agent-tests/classes"/>
         <javac srcdir="pull-agent/src/test/java" destdir="build/pull-agent-tests/classes"
deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/core-tests/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1571,7 +1586,7 @@
         <mkdir dir="build/script-engine-tests/classes"/>
         <javac srcdir="script-engine/src/test/java" destdir="build/script-engine-tests/classes"
deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/script-engine/classes"/>
             </classpath>
@@ -1611,6 +1626,15 @@
             <fileset dir="../lib">
                 <include name="junit*.jar"/>
                 <include name="juli*.jar"/>
+                <include name="powermock-module-junit4*.jar"/>
+                <include name="powermock-core*.jar"/>
+                <include name="powermock-reflect*.jar"/>
+                <include name="powermock-api-support*.jar"/>
+                <include name="powermock-api-mockito*.jar"/>
+                <include name="mockito-all*.jar"/>
+                <include name="noggit*.jar"/>
+                <include name="javassist*.jar"/>
+                <include name="objenesis*.jar"/>
             </fileset>
             <fileset dir="build/test-jar">
                 <include name="mcf-core-tests.jar"/>
@@ -1627,7 +1651,7 @@
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/core-tests/classes"/>
             </classpath>
@@ -1646,7 +1670,7 @@
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/core-tests/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1666,7 +1690,7 @@
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/script-engine/classes"/>
                 <pathelement location="build/script-engine-tests/classes"/>
@@ -1683,7 +1707,7 @@
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <fileset dir="build/test-jar">
                     <include name="mcf-core-tests.jar"/>
                 </fileset>
@@ -1701,7 +1725,7 @@
         <mkdir dir="test-derby-output"/>
         <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1724,7 +1748,7 @@
         <mkdir dir="test-postgresql-output"/>
         <junit fork="true" maxmemory="128m" dir="test-postgresql-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1747,7 +1771,7 @@
         <mkdir dir="test-mysql-output"/>
         <junit fork="true" maxmemory="128m" dir="test-mysql-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1770,7 +1794,7 @@
         <mkdir dir="test-HSQLDB-output"/>
         <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1793,7 +1817,7 @@
         <mkdir dir="test-HSQLDBext-output"/>
         <junit fork="true" maxmemory="128m" dir="test-HSQLDBext-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>

Modified: manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml?rev=1613081&r1=1613080&r2=1613081&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml Thu Jul
24 11:56:44 2014
@@ -130,7 +130,6 @@
             <include name="slf4j*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
-            <include name="junit*.jar"/>
             <include name="log4j*.jar"/>
             <include name="serializer*.jar"/>
             <include name="servlet-api*.jar"/>

Modified: manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt?rev=1613081&r1=1613080&r2=1613081&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt Thu Jul 24 11:56:44 2014
@@ -327,10 +327,29 @@ License: Apache 2  (http://www.apache.or
 This product includes a tagsoup.jar.
 License: Apache 2 (http://home.ccil.org/~cowan/XML/tagsoup/)
 
+This product includes a mockito-all.jar.
+License: MIT (http://code.google.com/p/mockito/wiki/License)
+
 This product may include pdf files that embed IPA-licensed fonts.
 License: IPA Font License Agreement v1.0 (http://ossipedia.ipa.go.jp/ipafont/index.html#LicenseEng)
 
 ==========================================================================
+The following license applies to mockito-all.jar:
+--------------------------------------------------------------------------
+
+
+The MIT License
+
+Copyright (c) 2007 Mockito contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+==========================================================================
 The following license applies to json.jar, which is generated from the json
 sources from http://www.json.org/java/index.html
 --------------------------------------------------------------------------

Modified: manifoldcf/branches/CONNECTORS-856-2/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/pom.xml?rev=1613081&r1=1613080&r2=1613081&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/pom.xml Thu Jul 24 11:56:44 2014
@@ -38,6 +38,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- dependency versions -->
     <junit.version>4.8.2</junit.version>
+    <powerMock.version>1.5.2</powerMock.version>
     <postgresql.version>9.1-901.jdbc4</postgresql.version>
     <mysql.version>5.1.18</mysql.version>
     <hsqldb.version>2.3.1</hsqldb.version>



Mime
View raw message