Modified: manifoldcf/branches/dev_1x/connectors/alfresco/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco/pom.xml?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/alfresco/pom.xml (original) +++ manifoldcf/branches/dev_1x/connectors/alfresco/pom.xml Tue Oct 14 12:09:05 2014 @@ -467,6 +467,11 @@ <version>${jetty.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.eclipse.jetty.toolchain</groupId> + <artifactId>jetty-schemas</artifactId> + <version>3.1.M0</version> + </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> @@ -520,4 +525,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project>
Modified: manifoldcf/branches/dev_1x/connectors/cmis/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/cmis/build.xml?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/cmis/build.xml (original) +++ manifoldcf/branches/dev_1x/connectors/cmis/build.xml Tue Oct 14 12:09:05 2014 @@ -30,6 +30,30 @@ <import file="${mcf-dist}/connector-build.xml"/> + <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"> @@ -74,4 +98,30 @@ </antcall> </target> + <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"> + <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> + <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=../test-materials/chemistry-opencmis-server-inmemory-${chemistry.version}.war"/> + <jvmarg value="-Xms128m"/> + <jvmarg value="-Xmx256m"/> + <classpath> + <fileset dir="${env.JAVA_HOME}/lib"> + <include name="tools.jar"/> + </fileset> + <path refid="connector-test-classpath"/> + <pathelement location="build/connector-tests/classes"/> + </classpath> + <formatter type="brief" usefile="false"/> + <batchtest todir="test-HSQLDB-output"> + <fileset dir="build/connector-tests/classes"> + <include name="**/*HSQLDBIT.class"/> + </fileset> + </batchtest> + </junit> + </target> + </project> Modified: manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.bat URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.bat?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.bat (original) +++ manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.bat Tue Oct 14 12:09:05 2014 @@ -19,7 +19,7 @@ if not exist "%JAVA_HOME%\bin\java.exe" if not exist "%MCF_HOME%\properties.xml" goto nolcfhome rem save existing path here set OLDDIR=%CD% -cd "%MCF_HOME%\..\documentum-registry-process" +cd "%MCF_HOME%\..\processes\documentum-registry" set CLASSPATH=. for %%f in (lib/*) do call setclasspath.bat %%f rem restore old path here Modified: manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.sh URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.sh?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.sh (original) +++ manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/run.sh Tue Oct 14 12:09:05 2014 @@ -27,11 +27,11 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then # Build the classpath CLASSPATH="" - for filename in $(ls -1 "$MCF_HOME"/../documentum-registry-process/lib) ; do + for filename in $(ls -1 "$MCF_HOME"/../processes/documentum-registry/lib) ; do if [ -n "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-registry-process/lib/"$filename" + CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../processes/documentum-registry/lib/"$filename" else - CLASSPATH="$MCF_HOME"/../documentum-registry-process/lib/"$filename" + CLASSPATH="$MCF_HOME"/../processes/documentum-registry/lib/"$filename" fi done Modified: manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/setclasspath.bat URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/setclasspath.bat?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/setclasspath.bat (original) +++ manifoldcf/branches/dev_1x/connectors/documentum/registry-scripts/setclasspath.bat Tue Oct 14 12:09:05 2014 @@ -13,4 +13,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF rem See the License for the specific language governing permissions and rem limitations under the License. -set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\documentum-registry-process\lib\%1 +set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\processes\documentum-registry\lib\%1 Modified: manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.bat URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.bat?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.bat (original) +++ manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.bat Tue Oct 14 12:09:05 2014 @@ -23,7 +23,7 @@ if not exist "%DOCUMENTUM%\dfc.propertie :dctmhomefound rem save existing path here set OLDDIR=%CD% -cd "%MCF_HOME%\..\documentum-server-process" +cd "%MCF_HOME%\..\processes\documentum-server" set CLASSPATH=. for %%f in (lib/*) do call setclasspath.bat %%f lib for %%f in (lib-proprietary/*.jar) do call setclasspath.bat %%f lib-proprietary Modified: manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.sh URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.sh?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.sh (original) +++ manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/run.sh Tue Oct 14 12:09:05 2014 @@ -29,19 +29,19 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then # Build the classpath CLASSPATH="" - for filename in $(ls -1 "$MCF_HOME"/../documentum-server-process/lib) ; do + for filename in $(ls -1 "$MCF_HOME"/../processes/documentum-server/lib) ; do if [ -n "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-server-process/lib/"$filename" + CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../processes/documentum-server/lib/"$filename" else - CLASSPATH="$MCF_HOME"/../documentum-server-process/lib/"$filename" + CLASSPATH="$MCF_HOME"/../processes/documentum-server/lib/"$filename" fi done - for filename in $(ls -1 "$MCF_HOME"/../documentum-server-process/lib-proprietary | grep "\.jar$") ; do + for filename in $(ls -1 "$MCF_HOME"/../processes/documentum-server/lib-proprietary | grep "\.jar$") ; do if [ -n "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-server-process/lib-proprietary/"$filename" + CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../processes/documentum-server/lib-proprietary/"$filename" else - CLASSPATH="$MCF_HOME"/../documentum-server-process/lib-proprietary/"$filename" + CLASSPATH="$MCF_HOME"/../processes/documentum-server/lib-proprietary/"$filename" fi done Modified: manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/setclasspath.bat URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/setclasspath.bat?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/setclasspath.bat (original) +++ manifoldcf/branches/dev_1x/connectors/documentum/server-scripts/setclasspath.bat Tue Oct 14 12:09:05 2014 @@ -13,4 +13,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF rem See the License for the specific language governing permissions and rem limitations under the License. -set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\documentum-server-process\%2\%1 +set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\processes\documentum-server\%2\%1 Modified: manifoldcf/branches/dev_1x/connectors/elasticsearch/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/elasticsearch/build.xml?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/elasticsearch/build.xml (original) +++ manifoldcf/branches/dev_1x/connectors/elasticsearch/build.xml Tue Oct 14 12:09:05 2014 @@ -30,34 +30,36 @@ <import file="${mcf-dist}/connector-build.xml"/> + <property name="elasticsearch.version" value="1.0.1"/> + <target name="download-dependencies"> <mkdir dir="build/download"/> - <get src="http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.0.1.tar.gz"; + <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-1.0.1/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-1.0.1/plugins/mapper-attachments.zip"/> + dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"/> - <unzip src="test-materials-proprietary/elasticsearch-1.0.1/plugins/mapper-attachments.zip" dest="test-materials-proprietary/elasticsearch-1.0.1/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-1.0.1" perm="ugo+rxw"> + <chmod dir="test-materials/elasticsearch-${elasticsearch.version}" perm="ugo+rxw"> <fileset dir="**/*"/> </chmod> - <chmod file="test-materials-proprietary/elasticsearch-1.0.1/bin/plugin" perm="ugo+rx"/> - <chmod file="test-materials-proprietary/elasticsearch-1.0.1/bin/elasticsearch" perm="ugo+rx"/> - <chmod file="test-materials-proprietary/elasticsearch-1.0.1/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> @@ -69,7 +71,7 @@ </target> <target name="calculate-testcode-condition"> - <available file="test-materials-proprietary/elasticsearch-1.0.1" 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"> @@ -78,7 +80,7 @@ <path id="connector-test-classpath"> <path refid="mcf-connector-build.connector-test-classpath"/> - <fileset dir="test-materials-proprietary/elasticsearch-1.0.1"> + <fileset dir="test-materials/elasticsearch-${elasticsearch.version}"> <include name="lib/*.jar"/> <include name="plugins/mapper-attachments/*.jar"/> </fileset> Modified: manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.bat URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.bat?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.bat (original) +++ manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.bat Tue Oct 14 12:09:05 2014 @@ -19,7 +19,7 @@ if not exist "%JAVA_HOME%\bin\java.exe" if not exist "%MCF_HOME%\properties.xml" goto nolcfhome rem save existing path here set OLDDIR=%CD% -cd "%MCF_HOME%\..\filenet-registry-process" +cd "%MCF_HOME%\..\processes\filenet-registry" set CLASSPATH=. for %%f in (lib/*) do call setclasspath.bat %%f rem restore old path here Modified: manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.sh URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.sh?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.sh (original) +++ manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/run.sh Tue Oct 14 12:09:05 2014 @@ -27,11 +27,11 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then # Build the classpath CLASSPATH="" - for filename in $(ls -1 "$MCF_HOME"/../filenet-registry-process/lib) ; do + for filename in $(ls -1 "$MCF_HOME"/../processes/filenet-registry/lib) ; do if [ -n "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-registry-process/lib/"$filename" + CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../processes/filenet-registry/lib/"$filename" else - CLASSPATH="$MCF_HOME"/../filenet-registry-process/lib/"$filename" + CLASSPATH="$MCF_HOME"/../processes/filenet-registry/lib/"$filename" fi done Modified: manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/setclasspath.bat URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/setclasspath.bat?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/setclasspath.bat (original) +++ manifoldcf/branches/dev_1x/connectors/filenet/registry-scripts/setclasspath.bat Tue Oct 14 12:09:05 2014 @@ -13,4 +13,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF rem See the License for the specific language governing permissions and rem limitations under the License. -set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\filenet-registry-process\lib\%1 +set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\processes\filenet-registry\lib\%1 Modified: manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.bat URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.bat?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.bat (original) +++ manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.bat Tue Oct 14 12:09:05 2014 @@ -19,7 +19,7 @@ if not exist "%JAVA_HOME%\bin\java.exe" if not exist "%MCF_HOME%\properties.xml" goto nolcfhome rem save existing path here set OLDDIR=%CD% -cd "%MCF_HOME%\..\filenet-server-process" +cd "%MCF_HOME%\..\processes\filenet-server" set CLASSPATH=. for %%f in (lib/*) do call setclasspath.bat %%f lib for %%f in (lib-proprietary/*.jar) do call setclasspath.bat %%f lib-proprietary Modified: manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.sh URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.sh?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.sh (original) +++ manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/run.sh Tue Oct 14 12:09:05 2014 @@ -27,19 +27,19 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then # Build the classpath CLASSPATH="" - for filename in $(ls -1 "$MCF_HOME"/../filenet-server-process/lib) ; do + for filename in $(ls -1 "$MCF_HOME"/../processes/filenet-server/lib) ; do if [ -n "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-server-process/lib/"$filename" + CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../processes/filenet-server/lib/"$filename" else - CLASSPATH="$MCF_HOME"/../filenet-server-process/lib/"$filename" + CLASSPATH="$MCF_HOME"/../processes/filenet-server/lib/"$filename" fi done - for filename in $(ls -1 "$MCF_HOME"/../filenet-server-process/lib-proprietary | grep "\.jar$") ; do + for filename in $(ls -1 "$MCF_HOME"/../processes/filenet-server/lib-proprietary | grep "\.jar$") ; do if [ -n "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-server-process/lib-proprietary/"$filename" + CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../processes/filenet-server/lib-proprietary/"$filename" else - CLASSPATH="$MCF_HOME"/../filenet-server-process/lib-proprietary/"$filename" + CLASSPATH="$MCF_HOME"/../processes/filenet-server/lib-proprietary/"$filename" fi done Modified: manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/setclasspath.bat URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/setclasspath.bat?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/setclasspath.bat (original) +++ manifoldcf/branches/dev_1x/connectors/filenet/server-scripts/setclasspath.bat Tue Oct 14 12:09:05 2014 @@ -13,4 +13,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF rem See the License for the specific language governing permissions and rem limitations under the License. -set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\filenet-server-process\%2\%1 +set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\processes\filenet-server\%2\%1 Modified: manifoldcf/branches/dev_1x/connectors/jcifs/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/jcifs/build.xml?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/jcifs/build.xml (original) +++ manifoldcf/branches/dev_1x/connectors/jcifs/build.xml Tue Oct 14 12:09:05 2014 @@ -30,8 +30,10 @@ <import file="${mcf-dist}/connector-build.xml"/> + <property name="jcifs.version" value="1.3.17"/> + <target name="calculate-condition"> - <available file="lib-proprietary/jcifs.jar" property="jcifsStatus"/> + <available file="lib-proprietary/jcifs-${jcifs.version}.jar" property="jcifsStatus"/> <condition property="build-present"> <isset property="jcifsStatus"/> </condition> @@ -54,10 +56,9 @@ </target> <target name="download-jcifs"> - <property name="jcifs-version" value="1.3.17"/> <antcall target="download-via-maven"> <param name="project-path" value="jcifs"/> - <param name="artifact-version" value="${jcifs-version}"/> + <param name="artifact-version" value="${jcifs.version}"/> <param name="target" value="lib-proprietary"/> <param name="artifact-name" value="jcifs"/> <param name="artifact-type" value="jar"/> Propchange: manifoldcf/branches/dev_1x/connectors/jcifs/lib-proprietary/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Oct 14 12:09:05 2014 @@ -1 +1,4 @@ -jcifs.jar +*.jar +*.war +*.wsdl +*.xsd Propchange: manifoldcf/branches/dev_1x/connectors/rss/ ------------------------------------------------------------------------------ Merged /manifoldcf/trunk/connectors/rss:r1628798 Merged /manifoldcf/branches/CONNECTORS-1050/connectors/rss:r1628142-1628796 Modified: manifoldcf/branches/dev_1x/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java (original) +++ manifoldcf/branches/dev_1x/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java Tue Oct 14 12:09:05 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.*; import java.util.*; @@ -39,8 +39,10 @@ public class MockRSSService public MockRSSService(int docsPerFeed) { - server = new Server(8189); - server.setThreadPool(new QueuedThreadPool(35)); + server = new Server(new QueuedThreadPool(35)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8189); + server.addConnector(connector); servlet = new RSSServlet(docsPerFeed); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setContextPath("/rss"); Modified: manifoldcf/branches/dev_1x/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java (original) +++ manifoldcf/branches/dev_1x/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java Tue Oct 14 12:09:05 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.agents.out import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.*; import java.util.*; @@ -39,8 +39,10 @@ public class MockSolrService public MockSolrService() { - server = new Server(8188); - server.setThreadPool(new QueuedThreadPool(35)); + server = new Server(new QueuedThreadPool(35)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8188); + server.addConnector(connector); servlet = new SolrServlet(); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setInitParameter("org.eclipse.jetty.servlet.SessionIdPathParameterName","none"); Modified: manifoldcf/branches/dev_1x/connectors/tika/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/tika/build.xml?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/tika/build.xml (original) +++ manifoldcf/branches/dev_1x/connectors/tika/build.xml Tue Oct 14 12:09:05 2014 @@ -41,9 +41,10 @@ <include name="tika-parsers*.jar"/> <include name="tagsoup*.jar"/> <include name="poi*.jar"/> - <include name="vorbis-java-tika*.jar"/> - <include name="vorbis-java-core*.jar"/> + <include name="vorbis-java*.jar"/> <include name="netcdf*.jar"/> + <include name="unidataCommon*.jar"/> + <include name="commons-httpclient*.jar"/> <include name="apache-mime4j-core*.jar"/> <include name="apache-mime4j-dom*.jar"/> <include name="commons-compress*.jar"/> @@ -60,7 +61,7 @@ <include name="xmlbeans*.jar"/> <include name="dom4j*.jar"/> <include name="geronimo-stax-api_1.0_spec*.jar"/> - <include name="asm-debug-all*.jar"/> + <include name="asm*.jar"/> <include name="isoparser*.jar"/> <include name="aspectjrt*.jar"/> <include name="metadata-extractor*.jar"/> @@ -73,6 +74,8 @@ <include name="vorbis-java-core*.jar"/> <include name="juniversalchardet*.jar"/> <include name="jhighlight*.jar"/> + <include name="jmatio*.jar"/> + <include name="java-libpst*.jar"/> </fileset> </path> @@ -88,9 +91,10 @@ <include name="tika-parsers*.jar"/> <include name="tagsoup*.jar"/> <include name="poi*.jar"/> - <include name="vorbis-java-tika*.jar"/> - <include name="vorbis-java-core*.jar"/> + <include name="vorbis-java*.jar"/> <include name="netcdf*.jar"/> + <include name="unidataCommon*.jar"/> + <include name="commons-httpclient*.jar"/> <include name="apache-mime4j-core*.jar"/> <include name="apache-mime4j-dom*.jar"/> <include name="commons-compress*.jar"/> @@ -107,7 +111,7 @@ <include name="xmlbeans*.jar"/> <include name="dom4j*.jar"/> <include name="geronimo-stax-api_1.0_spec*.jar"/> - <include name="asm-debug-all*.jar"/> + <include name="asm*.jar"/> <include name="isoparser*.jar"/> <include name="aspectjrt*.jar"/> <include name="metadata-extractor*.jar"/> @@ -120,6 +124,8 @@ <include name="vorbis-java-core*.jar"/> <include name="juniversalchardet*.jar"/> <include name="jhighlight*.jar"/> + <include name="jmatio*.jar"/> + <include name="java-libpst*.jar"/> </fileset> </copy> </target> Modified: manifoldcf/branches/dev_1x/connectors/tika/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/tika/pom.xml?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/tika/pom.xml (original) +++ manifoldcf/branches/dev_1x/connectors/tika/pom.xml Tue Oct 14 12:09:05 2014 @@ -221,33 +221,6 @@ <artifactId>tika-parsers</artifactId> <version>1.5</version> </dependency> - <!-- Override tika dependencies, to make sure we fix various - CVE's --> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>${xmlbeans.version}</version> - </dependency> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <version>${poi.version}</version> - </dependency> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml</artifactId> - <version>${poi.version}</version> - </dependency> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml-schemas</artifactId> - <version>${poi.version}</version> - </dependency> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-scratchpad</artifactId> - <version>${poi.version}</version> - </dependency> <!-- Testing dependencies --> Modified: manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java (original) +++ manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java Tue Oct 14 12:09:05 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -39,8 +40,10 @@ public class MockSessionWebService public MockSessionWebService(int numContentDocs, String userName, String password) { - server = new Server(8191); - server.setThreadPool(new QueuedThreadPool(100)); + server = new Server(new QueuedThreadPool(100)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8191); + server.addConnector(connector); servlet = new SessionWebServlet(numContentDocs,userName,password); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setInitParameter("org.eclipse.jetty.servlet.SessionIdPathParameterName","none"); Modified: manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java (original) +++ manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java Tue Oct 14 12:09:05 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.*; import java.util.*; @@ -44,8 +44,10 @@ public class MockWebService public MockWebService(int docsPerLevel, int maxLevels, boolean generateBadPages) { - server = new Server(8191); - server.setThreadPool(new QueuedThreadPool(100)); + server = new Server(new QueuedThreadPool(100)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8191); + server.addConnector(connector); servlet = new WebServlet(docsPerLevel, maxLevels, generateBadPages); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setContextPath("/web"); Propchange: manifoldcf/branches/dev_1x/connectors/wiki/ ------------------------------------------------------------------------------ Merged /manifoldcf/trunk/connectors/wiki:r1628798 Merged /manifoldcf/branches/CONNECTORS-1050/connectors/wiki:r1628142-1628796 Modified: manifoldcf/branches/dev_1x/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java?rev=1631727&r1=1631726&r2=1631727&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java (original) +++ manifoldcf/branches/dev_1x/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java Tue Oct 14 12:09:05 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -38,8 +39,10 @@ public class MockWikiService public MockWikiService(Class theResourceClass) { - server = new Server(8089); - server.setThreadPool(new QueuedThreadPool(35)); + server = new Server(new QueuedThreadPool(35)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8089); + server.addConnector(connector); servlet = new WikiAPIServlet(theResourceClass); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setContextPath("/w");
