You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/04/02 16:10:11 UTC
svn commit: r1584043 - in /manifoldcf/branches/CONNECTORS-818-2: ./
build.xml connectors/ connectors/pom.xml connectors/rabbitmq/
connectors/rabbitmq/build.xml connectors/rabbitmq/pom.xml
Author: kwright
Date: Wed Apr 2 14:10:11 2014
New Revision: 1584043
URL: http://svn.apache.org/r1584043
Log:
Merge CONNECTORS-818 changes from CONNECTORS-818 branch
Added:
manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/
- copied from r1550495, manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/
Modified:
manifoldcf/branches/CONNECTORS-818-2/ (props changed)
manifoldcf/branches/CONNECTORS-818-2/build.xml
manifoldcf/branches/CONNECTORS-818-2/connectors/ (props changed)
manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml
manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/build.xml
manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/pom.xml
Propchange: manifoldcf/branches/CONNECTORS-818-2/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-818:r1544168-1550081,1550084-1550493
Merged /manifoldcf/branches/CONNECTORS-818-2:r1550082-1550083,1550490-1550495
Modified: manifoldcf/branches/CONNECTORS-818-2/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-818-2/build.xml?rev=1584043&r1=1584042&r2=1584043&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-818-2/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-818-2/build.xml Wed Apr 2 14:10:11 2014
@@ -43,7 +43,6 @@
<echo message="Overlay -lib package, or run 'make-core-deps' target first"/>
</target>
-
<target name="build-site" depends="downloaded-check" if="downloaded">
<ant dir="site" target="all"/>
</target>
@@ -2354,6 +2353,17 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
+ <target name="download-rabbitmq-client">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="com/rabbitmq"/>
+ <param name="artifact-version" value="3.1.4"/>
+ <param name="artifact-name" value="amqp-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-google-api-client">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
@@ -2518,7 +2528,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps" depends="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,download-ecj,download-hadoop,
download-protobuf">
+ <target name="make-core-deps" depends="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,download-ecj,download-hadoop,
download-protobuf,download-rabbitmq-client">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Propchange: manifoldcf/branches/CONNECTORS-818-2/connectors/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 2 14:10:11 2014
@@ -1 +1,2 @@
target
+.project
Modified: manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml?rev=1584043&r1=1584042&r2=1584043&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml Wed Apr 2 14:10:11 2014
@@ -43,7 +43,6 @@
<module>nullauthority</module>
<module>nulloutput</module>
<module>rss</module>
- <module>sharepoint</module>
<module>solr</module>
<module>webcrawler</module>
<module>cmis</module>
@@ -57,6 +56,7 @@
<module>generic</module>
<module>regexpmapper</module>
<module>email</module>
+ <module>rabbitmq</module>
</modules>
</project>
Modified: manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/build.xml?rev=1584043&r1=1550495&r2=1584043&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/build.xml Wed Apr 2 14:10:11 2014
@@ -17,10 +17,18 @@
<project name="rabbitmq" default="all">
- <import file="../connector-build.xml"/>
+ <property environment="env"/>
+ <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+ <isset property="env.MCFDISTPATH"/>
+ </condition>
+ <property name="abs-dist" location="../../dist"/>
+ <condition property="mcf-dist" value="${abs-dist}">
+ <not>
+ <isset property="env.MCFDISTPATH"/>
+ </not>
+ </condition>
- <target name="download-dependencies">
- </target>
+ <import file="${mcf-dist}/connector-build.xml"/>
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
@@ -29,7 +37,7 @@
</fileset>
</path>
-<target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
+ <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
<mkdir dir="dist/lib"/>
<copy todir="dist/lib">
<fileset dir="../../lib">
@@ -37,8 +45,12 @@
</fileset>
</copy>
</target>
- <target name="download-cleanup">
-
+
+ <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+ <!-- antcall target="general-add-repository-connector">
+ <param name="connector-label" value="RabbitMQ"/>
+ <param name="connector-class" value="org.apache.manifoldcf.???"/>
+ </antcall -->
</target>
</project>
Modified: manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/pom.xml?rev=1584043&r1=1550495&r2=1584043&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/pom.xml Wed Apr 2 14:10:11 2014
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.manifoldcf</groupId>
<artifactId>mcf-connectors</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,21 +33,41 @@
</developer>
</developers>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
<artifactId>mcf-rabbitmq-connector</artifactId>
<name>ManifoldCF - Connectors - RabbitMQ</name>
<build>
+ <defaultGoal>integration-test</defaultGoal>
<sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
- </resource>
- <resource>
<directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
+
<plugins>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
@@ -69,15 +89,104 @@
</execution>
</executions>
</plugin>
+
+ <!-- Test plugin configuration -->
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-war</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/dependency</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-api-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ <destFileName>mcf-api-service.war</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-authority-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ <destFileName>mcf-authority-service.war</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ <destFileName>mcf-crawler-ui.war</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*Postgresql*.java</exclude>
+ <exclude>**/*MySQL*.java</exclude>
+ </excludes>
+ <forkMode>always</forkMode>
+ <workingDirectory>target/test-output</workingDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.12.3</version>
+ <configuration>
+ <skipTests>${skipITs}</skipTests>
+ <systemPropertyVariables>
+ <crawlerWarPath>../dependency/mcf-crawler-ui.war</crawlerWarPath>
+ <authorityserviceWarPath>../dependency/mcf-authority-service.war</authorityserviceWarPath>
+ <apiWarPath>../dependency/mcf-api-service.war</apiWarPath>
+ </systemPropertyVariables>
+ <excludes>
+ <exclude>**/*Postgresql*.java</exclude>
+ <exclude>**/*MySQL*.java</exclude>
+ </excludes>
+ <forkMode>always</forkMode>
+ <workingDirectory>target/test-output</workingDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
+
</build>
<dependencies>
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>3.1.4</version>
- </dependency>
+
+ <!-- Main build dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-core</artifactId>
@@ -99,6 +208,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>3.1.4</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcomponent.httpclient.version}</version>
@@ -113,6 +227,9 @@
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
+
+ <!-- Testing dependencies -->
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -140,6 +257,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
@@ -158,5 +276,115 @@
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-api-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-authority-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1-glassfish</artifactId>
+ <version>${glassfish.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-glassfish</artifactId>
+ <version>${glassfish.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.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>