manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1646117 - in /manifoldcf/branches/CONNECTORS-1035/framework: ./ buildfiles/ connector-common/ connector-common/src/ connector-common/src/main/ connector-common/src/main/java/ connector-common/src/main/java/org/ connector-common/src/main/ja...
Date Wed, 17 Dec 2014 00:19:32 GMT
Author: kwright
Date: Wed Dec 17 00:19:31 2014
New Revision: 1646117

URL: http://svn.apache.org/r1646117
Log:
Create the connector-common support, largely lifted from trunk

Added:
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/pom.xml   (with props)
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/CommonsHTTPSender.java
      - copied, changed from r1646112, manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/common/CommonsHTTPSender.java
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/extmimemap/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/extmimemap/ExtensionMimeMap.java
      - copied, changed from r1646112, manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/apache/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/apache/manifoldcf/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/
    manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd
      - copied, changed from r1646112, manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd
Removed:
    manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/common/CommonsHTTPSender.java
    manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
    manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd
Modified:
    manifoldcf/branches/CONNECTORS-1035/framework/build.xml
    manifoldcf/branches/CONNECTORS-1035/framework/buildfiles/connector-build.xml
    manifoldcf/branches/CONNECTORS-1035/framework/core/pom.xml
    manifoldcf/branches/CONNECTORS-1035/framework/pom.xml

Modified: manifoldcf/branches/CONNECTORS-1035/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1035/framework/build.xml?rev=1646117&r1=1646116&r2=1646117&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1035/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1035/framework/build.xml Wed Dec 17 00:19:31 2014
@@ -32,6 +32,55 @@
     
     <path id="framework-classpath">
         <fileset dir="../lib">
+            <include name="zookeeper*.jar"/>
+            <include name="json*.jar"/>
+            <include name="commons-codec*.jar"/>
+            <include name="commons-collections*.jar"/>
+            <include name="commons-el*.jar"/>
+            <include name="commons-fileupload*.jar"/>
+            <include name="httpcore*.jar"/>
+            <include name="httpclient*.jar"/>
+            <include name="commons-io*.jar"/>
+            <include name="commons-lang*.jar"/>
+            <include name="commons-logging*.jar"/>
+            <include name="ecj*.jar"/>
+            <include name="jasper*.jar"/>
+            <include name="jetty*.jar"/>
+            <include name="slf4j*.jar"/>
+            <include name="jsp-2.1*.jar"/>
+            <include name="jsp-api*.jar"/>
+            <include name="log4j*.jar"/>
+            <include name="serializer*.jar"/>
+            <include name="javax.servlet-api*.jar"/>
+            <include name="juli*.jar"/>
+            <include name="xalan*.jar"/>
+            <include name="xercesImpl*.jar"/>
+            <include name="xml-apis*.jar"/>
+            <include name="velocity*.jar"/>
+            <include name="mail*.jar"/>
+        </fileset>
+        <fileset dir="../lib">
+            <include name="postgresql*.jar"/>
+            <include name="derby*.jar"/>
+            <include name="hsqldb*.jar"/>
+        </fileset>
+        <fileset dir="../lib">
+            <include name="junit*.jar"/>
+            <include name="mockito-core*.jar"/>
+            <include name="wiremock*.jar"/>
+            <include name="objenesis*.jar"/>
+        </fileset>
+        <fileset dir="../lib-proprietary">
+            <include name="mysql*.jar"/>
+            <include name="ojdbc*.jar"/>
+            <include name="jtds*.jar"/>
+            <include name="mariadb-java-client*.jar"/>
+        </fileset>
+
+    </path>
+    
+    <path id="connector-common-classpath">
+        <fileset dir="../lib">
             <include name="tika-core*.jar"/>
             <include name="jackson-core*.jar"/>
             <include name="jackson-databind*.jar"/>
@@ -82,54 +131,8 @@
             <include name="opensaml*.jar"/>
             <include name="activation*.jar"/>
         </fileset>
-        <fileset dir="../lib">
-            <include name="zookeeper*.jar"/>
-            <include name="json*.jar"/>
-            <include name="commons-codec*.jar"/>
-            <include name="commons-collections*.jar"/>
-            <include name="commons-el*.jar"/>
-            <include name="commons-fileupload*.jar"/>
-            <include name="httpcore*.jar"/>
-            <include name="httpclient*.jar"/>
-            <include name="commons-io*.jar"/>
-            <include name="commons-lang*.jar"/>
-            <include name="commons-logging*.jar"/>
-            <include name="ecj*.jar"/>
-            <include name="jasper*.jar"/>
-            <include name="jetty*.jar"/>
-            <include name="slf4j*.jar"/>
-            <include name="jsp-2.1*.jar"/>
-            <include name="jsp-api*.jar"/>
-            <include name="log4j*.jar"/>
-            <include name="serializer*.jar"/>
-            <include name="javax.servlet-api*.jar"/>
-            <include name="juli*.jar"/>
-            <include name="xalan*.jar"/>
-            <include name="xercesImpl*.jar"/>
-            <include name="xml-apis*.jar"/>
-            <include name="velocity*.jar"/>
-            <include name="mail*.jar"/>
-        </fileset>
-        <fileset dir="../lib">
-            <include name="postgresql*.jar"/>
-            <include name="derby*.jar"/>
-            <include name="hsqldb*.jar"/>
-        </fileset>
-        <fileset dir="../lib">
-            <include name="junit*.jar"/>
-            <include name="mockito-core*.jar"/>
-            <include name="wiremock*.jar"/>
-            <include name="objenesis*.jar"/>
-        </fileset>
-        <fileset dir="../lib-proprietary">
-            <include name="mysql*.jar"/>
-            <include name="ojdbc*.jar"/>
-            <include name="jtds*.jar"/>
-            <include name="mariadb-java-client*.jar"/>
-        </fileset>
-
     </path>
-    
+
     <target name="doc">
         <mkdir dir="dist/doc"/>
         <javadoc destdir="dist/doc" maxmemory="256M" source="1.7" useexternalfile="true"
use="true" locale="en_US">
@@ -137,11 +140,13 @@
             <link href="http://manifoldcf.apache.org/release/trunk/api/framework/"/>
             <classpath>
                 <path refid="framework-classpath"/>
+                <path refid="connector-common-classpath"/>
             </classpath>
             <fileset dir="core/src/main/java" includes="**/*.java"/>
             <fileset dir="agents/src/main/java" includes="**/*.java"/>
             <fileset dir="pull-agent/src/main/java" includes="**/*.java"/>
             <fileset dir="ui-core/src/main/java" includes="**/*.java"/>
+            <fileset dir="connector-common/src/main/java" includes="**/*.java"/>
             <fileset dir="script-engine/src/main/java" includes="**/*.java"/>
             <fileset dir="jetty-runner/src/main/java" includes="**/*.java"/>
         </javadoc>
@@ -180,6 +185,22 @@
         </javac>
     </target>
 
+    <target name="compile-connector-common" depends="compile-core,compile-agents,compile-ui-core">
+        <mkdir dir="build/connector-common/classes"/>
+        <copy todir="build/connector-common/classes">
+            <fileset dir="connector-common/src/main/resources"/>
+        </copy>
+        <javac srcdir="connector-common/src/main/java" destdir="build/connector-common/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="connector-common-classpath"/>
+                <pathelement location="build/core/classes"/>
+                <pathelement location="build/agents/classes"/>
+                <pathelement location="build/ui-core/classes"/>
+           </classpath>
+        </javac>
+    </target>
+
     <target name="compile-pull-agent" depends="compile-core,compile-agents">
         <mkdir dir="build/pull-agent/classes"/>
         <javac srcdir="pull-agent/src/main/java" destdir="build/pull-agent/classes" deprecation="true"
target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
@@ -343,6 +364,11 @@
         <jar destfile="build/jar/mcf-agents.jar" basedir="build/agents/classes"/>
     </target>
 
+    <target name="jar-connector-common" depends="compile-connector-common">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/mcf-connector-common.jar" basedir="build/connector-common/classes"/>
+    </target>
+
     <target name="jar-pull-agent" depends="compile-pull-agent">
         <mkdir dir="build/jar"/>
         <jar destfile="build/jar/mcf-pull-agent.jar" basedir="build/pull-agent/classes"/>
@@ -1835,9 +1861,71 @@
         </antcall>
     </target>
 
+    <!-- Set up connector-common-lib -->
+    
+    <target name="connector-common-lib" depends="jar-connector-common">
+        <mkdir dir="dist/connector-common-lib"/>
+        <copy todir="dist/connector-common-lib">
+            <fileset dir="build/jar">
+                <include name="mcf-connector-common.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="tika-core*.jar"/>
+                <include name="jackson-core*.jar"/>
+                <include name="jackson-databind*.jar"/>
+                <include name="jackson-annotations*.jar"/>
+                <include name="tika-parsers*.jar"/>
+                <include name="tagsoup*.jar"/>
+                <include name="poi*.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"/>
+                <include name="pdfbox*.jar"/>
+                <include name="fontbox*.jar"/>
+                <include name="jempbox*.jar"/>
+                <include name="bcmail-jdk15*.jar"/>
+                <include name="bcprov-jdk15*.jar"/>
+                <include name="xmlbeans*.jar"/>
+                <include name="dom4j*.jar"/>
+                <include name="geronimo-stax-api_1.0_spec*.jar"/>
+                <include name="asm*.jar"/>
+                <include name="isoparser*.jar"/>
+                <include name="aspectjrt*.jar"/>
+                <include name="metadata-extractor*.jar"/>
+                <include name="xmpcore*.jar"/>
+                <include name="xml-apis*.jar"/>
+                <include name="boilerpipe*.jar"/>
+                <include name="rome*.jar"/>
+                <include name="jdom*.jar"/>
+                <include name="xercesImpl*.jar"/>
+                <include name="vorbis-java-core*.jar"/>
+                <include name="juniversalchardet*.jar"/>
+                <include name="jhighlight*.jar"/>
+                <include name="jmatio*.jar"/>
+                <include name="java-libpst*.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="castor*.jar"/>
+                <include name="geronimo-javamail_1.4_spec*.jar"/>
+                <include name="commons-discovery*.jar"/>
+                <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
+                <include name="saaj*.jar"/>
+                <include name="wsdl4j*.jar"/>
+                <include name="xmlsec*.jar"/>
+                <include name="opensaml*.jar"/>
+                <include name="activation*.jar"/>
+            </fileset>
+        </copy>
+    </target>
+
     <!-- Set up example directories -->
     
-    <target name="example-common" depends="wars,wars-proprietary">
+    <target name="example-common" depends="wars,wars-proprietary,connector-common-lib">
         <copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
         <copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
         <mkdir dir="dist/connector-lib"/>
@@ -2083,6 +2171,18 @@
         </javac>
     </target>
 
+    <target name="compile-connector-common-tests" depends="compile-connector-common">
+        <mkdir dir="build/connector-common-tests/classes"/>
+        <javac srcdir="connector-common/src/test/java" destdir="build/connector-common-tests/classes"
deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="framework-classpath"/>
+                <pathelement location="build/core/classes"/>
+                <pathelement location="build/core-tests/classes"/>
+                <pathelement location="build/connector-common/classes"/>
+            </classpath>
+        </javac>
+    </target>
+
     <target name="compile-agents-tests" depends="compile-core-tests,compile-agents">
         <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">
@@ -2187,6 +2287,21 @@
         </junit>
     </target>
 
+    <target name="run-connector-common-tests" depends="compile-connector-common,compile-connector-common-tests,compile-core,compile-core-tests">
+        <mkdir dir="test-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+            <classpath>
+                <path refid="framework-classpath"/>
+                <pathelement location="build/core/classes"/>
+                <pathelement location="build/core-tests/classes"/>
+                <pathelement location="build/connector-common/classes"/>
+                <pathelement location="build/connector-common-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+        </junit>
+    </target>
+
     <target name="run-pull-agent-tests" depends="compile-pull-agent,compile-pull-agent-tests">
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
@@ -2240,7 +2355,7 @@
         </junit>
     </target>
 
-    <target name="run-tests" depends="compile-tests,run-core-tests,run-pull-agent-tests,run-script-engine-tests"/>
+    <target name="run-tests" depends="compile-tests,run-core-tests,run-connector-common-tests,run-pull-agent-tests,run-script-engine-tests"/>
 
     <target name="run-tests-derby" depends="compile-tests">
         <mkdir dir="test-derby-output"/>

Modified: manifoldcf/branches/CONNECTORS-1035/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1035/framework/buildfiles/connector-build.xml?rev=1646117&r1=1646116&r2=1646117&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1035/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1035/framework/buildfiles/connector-build.xml Wed Dec 17
00:19:31 2014
@@ -106,6 +106,9 @@
     </target>
 
     <path id="mcf-connector-build.connector-classpath">
+        <fileset dir="${mcf-dist}/connector-common-lib">
+            <include name="mcf-connector-common.jar"/>
+        </fileset>
         <fileset dir="${mcf-dist}/lib">
             <include name="mcf-core.jar"/>
             <include name="mcf-ui-core.jar"/>
@@ -140,7 +143,7 @@
             <include name="xml-apis*.jar"/>
             <include name="velocity*.jar"/>
         </fileset>
-        <fileset dir="${mcf-dist}/lib">
+        <fileset dir="${mcf-dist}/connector-common-lib">
             <include name="tika-core*.jar"/>
             <include name="jackson-core*.jar"/>
             <include name="jackson-databind*.jar"/>
@@ -179,7 +182,7 @@
             <include name="jmatio*.jar"/>
             <include name="java-libpst*.jar"/>
         </fileset>
-        <fileset dir="${mcf-dist}/lib">
+        <fileset dir="${mcf-dist}/connector-common-lib">
             <include name="axis*.jar"/>
             <include name="saaj*.jar"/>
             <include name="wsdl4j*.jar"/>
@@ -369,13 +372,15 @@
         <mkdir dir="build/wsdljava"/>
         <java classname="org.apache.axis.wsdl.WSDL2Java" fork="true">
             <classpath>
-                <fileset dir="${mcf-dist}/lib">
+                <fileset dir="${mcf-dist}/connector-common-lib">
                     <include name="axis*.jar"/>
                     <include name="saaj*.jar"/>
                     <include name="wsdl*.jar"/>
                     <include name="mail*.jar"/>
                     <include name="activation*.jar"/>
                     <include name="commons-discovery*.jar"/>
+                </fileset>
+                <fileset dir="${mcf-dist}/lib">
                     <include name="commons-logging*.jar"/>
                 </fileset>
             </classpath>
@@ -393,11 +398,13 @@
         <mkdir dir="build/xsdjava"/>
         <java classname="org.exolab.castor.builder.SourceGeneratorMain" fork="true">
             <classpath>
-                <fileset dir="${mcf-dist}/lib">
+                <fileset dir="${mcf-dist}/connector-common-lib">
                     <include name="castor*.jar"/>
                     <include name="geronimo-activation_1.1_spec*.jar"/>
                     <include name="geronimo-javamail_1.4_spec*.jar"/>
                     <include name="xerces*.jar"/>
+                </fileset>
+                <fileset dir="${mcf-dist}/lib">
                     <include name="commons-logging*.jar"/>
                 </fileset>
             </classpath>
@@ -422,7 +429,7 @@
         <mkdir dir="build/wsdlclasses"/>
         <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" deprecation="true"
target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
-                <fileset dir="${mcf-dist}/lib">
+                <fileset dir="${mcf-dist}/connector-common-lib">
                     <include name="axis*.jar"/>
                     <include name="saaj*.jar"/>
                     <include name="wsdl*.jar"/>
@@ -444,7 +451,7 @@
         <mkdir dir="build/xsdclasses"/>
         <javac srcdir="build/xsdjava" destdir="build/xsdclasses" deprecation="true" target="1.7"
source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
-                <fileset dir="${mcf-dist}/lib">
+                <fileset dir="${mcf-dist}/connector-common-lib">
                     <include name="castor*.jar"/>
                 </fileset>
             </classpath>

Added: manifoldcf/branches/CONNECTORS-1035/framework/connector-common/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1035/framework/connector-common/pom.xml?rev=1646117&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-1035/framework/connector-common/pom.xml (added)
+++ manifoldcf/branches/CONNECTORS-1035/framework/connector-common/pom.xml Wed Dec 17 00:19:31
2014
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.apache.manifoldcf</groupId>
+    <artifactId>mcf-framework</artifactId>
+    <version>1.9-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>mcf-connector-common</artifactId>
+  <name>ManifoldCF - Connector-Common</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/*Postgresql*.java</exclude>
+          </excludes>
+          <forkMode>always</forkMode>
+          <workingDirectory>target/test-output</workingDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <!-- Internal dependencies -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>${httpcomponent.httpclient.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>${json.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-core</artifactId>
+      <version>${tika.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>${activation.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis</artifactId>
+      <version>${axis.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ws.security</groupId>
+      <artifactId>wss4j</artifactId>
+      <version>1.5.12</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis-jaxrpc</artifactId>
+      <version>${axis.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.castor</groupId>
+      <artifactId>castor</artifactId>
+      <version>${castor.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>adaptx</groupId>
+          <artifactId>adaptx</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.transaction</groupId>
+          <artifactId>jta</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xerces</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>ldapsdk</groupId>
+          <artifactId>ldapsdk</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.cenqua.clover</groupId>
+          <artifactId>clover</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib-full</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>oro</groupId>
+          <artifactId>oro</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jakarta-regexp</groupId>
+          <artifactId>jakarta-regexp</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+      <version>${wsdl4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgresql.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>${hsqldb.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+</project>

Propchange: manifoldcf/branches/CONNECTORS-1035/framework/connector-common/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/CommonsHTTPSender.java
(from r1646112, manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/common/CommonsHTTPSender.java)
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/CommonsHTTPSender.java?p2=manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/CommonsHTTPSender.java&p1=manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/common/CommonsHTTPSender.java&r1=1646112&r2=1646117&rev=1646117&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/common/CommonsHTTPSender.java
(original)
+++ manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/CommonsHTTPSender.java
Wed Dec 17 00:19:31 2014
@@ -15,7 +15,7 @@
 *
 * $Id$
 */
-package org.apache.manifoldcf.core.common;
+package org.apache.manifoldcf.connectorcommon.common;
 
 import org.apache.manifoldcf.core.common.XThreadInputStream;
 

Copied: manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/extmimemap/ExtensionMimeMap.java
(from r1646112, manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java)
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/extmimemap/ExtensionMimeMap.java?p2=manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/extmimemap/ExtensionMimeMap.java&p1=manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java&r1=1646112&r2=1646117&rev=1646117&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
(original)
+++ manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/extmimemap/ExtensionMimeMap.java
Wed Dec 17 00:19:31 2014
@@ -17,7 +17,7 @@
 * limitations under the License.
 */
 
-package org.apache.manifoldcf.core.extmimemap;
+package org.apache.manifoldcf.connectorcommon.extmimemap;
 
 import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
 import org.apache.tika.Tika;

Copied: manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd
(from r1646112, manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd)
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd?p2=manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd&p1=manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd&r1=1646112&r2=1646117&rev=1646117&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1035/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd
(original)
+++ manifoldcf/branches/CONNECTORS-1035/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd
Wed Dec 17 00:19:31 2014
@@ -20,7 +20,7 @@
   <globalConfiguration> 
     <parameter name="disablePrettyXML" value="true"/> 
   </globalConfiguration> 
-  <transport name="http" pivot="java:org.apache.manifoldcf.core.common.CommonsHTTPSender">

+  <transport name="http" pivot="java:org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender">

     <parameter name="SO_TIMEOUT" locked="false">60000</parameter>
   </transport>
   <!-- transport name="http" pivot="java:org.apache.axis.transport.http.HTTPSender"/ -->


Modified: manifoldcf/branches/CONNECTORS-1035/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1035/framework/core/pom.xml?rev=1646117&r1=1646116&r2=1646117&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1035/framework/core/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1035/framework/core/pom.xml Wed Dec 17 00:19:31 2014
@@ -109,7 +109,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-core</artifactId>
       <version>${tika.version}</version>
@@ -190,7 +190,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j.version}</version>
-    </dependency>
+    </dependency -->
     
     <dependency>
       <groupId>javax.mail</groupId>

Modified: manifoldcf/branches/CONNECTORS-1035/framework/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1035/framework/pom.xml?rev=1646117&r1=1646116&r2=1646117&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1035/framework/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1035/framework/pom.xml Wed Dec 17 00:19:31 2014
@@ -33,6 +33,7 @@
 
   <modules>
     <module>core</module>
+    <module>connector-common</module>
     <module>ui-core</module>
     <module>agents</module>
     <module>pull-agent</module>



Mime
View raw message