manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r1641629 - in /manifoldcf/trunk: ./ connectors/alfresco-webscript/ connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ connectors/alfresco-webscript/connector/src/main/java/...
Date Tue, 25 Nov 2014 15:12:42 GMT
Author: maoo
Date: Tue Nov 25 15:12:42 2014
New Revision: 1641629

URL: http://svn.apache.org/r1641629
Log:
using alfresco-indexer 0.7.0 (from Maven Central) for alfresco-webscript connector

Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/common-build.xml
    manifoldcf/trunk/connectors/alfresco-webscript/build.xml
    manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java
    manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
    manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
    manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnectorTest.java
    manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java
    manifoldcf/trunk/connectors/alfresco-webscript/pom.xml

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1641629&r1=1641628&r2=1641629&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Tue Nov 25 15:12:42 2014
@@ -93,7 +93,7 @@
     <property name="jackson-core.version" value="2.1.3"/>
     <property name="jetty-jsp-jdt.version" value="2.3.3"/>
     <property name="jetty-schemas.version" value="3.1.M0"/>
-    <property name="alfresco-indexer-client.version" value="0.6.6"/>
+    <property name="alfresco-indexer-client.version" value="0.7.0"/>
     <property name="gson.version" value="2.2.4"/>
     <property name="guava.version" value="15.0"/>
     <property name="mockito.version" value="1.9.5"/>
@@ -739,7 +739,7 @@ Use Apache Forrest version forrest-0.9-d
     <target name="download-alfresco-indexer-client" depends="download-guava">
         <mkdir dir="lib"/>
         <antcall target="download-via-alfresco-indexer">
-            <param name="project-path" value="org/alfresco/consulting/indexer"/>
+            <param name="project-path" value="com/github/maoo/indexer"/>
             <param name="artifact-version" value="${alfresco-indexer-client.version}"/>
             <param name="target" value="lib"/>
             <param name="artifact-name" value="alfresco-indexer-client"/>

Modified: manifoldcf/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/common-build.xml?rev=1641629&r1=1641628&r2=1641629&view=diff
==============================================================================
--- manifoldcf/trunk/common-build.xml (original)
+++ manifoldcf/trunk/common-build.xml Tue Nov 25 15:12:42 2014
@@ -25,12 +25,8 @@
         <get src="${maven-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}"
dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
     </target>
 
-    <target name="setup-alfresco-indexer-url">
-        <property name="alfresco-indexer-base-url" value="https://repository-apachemaoo.forge.cloudbees.com/alfresco-indexer"/>
-    </target>
-    
-    <target name="download-via-alfresco-indexer" depends="setup-alfresco-indexer-url">
-        <get src="${alfresco-indexer-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}"
dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
+    <target name="download-via-alfresco-indexer" depends="setup-maven-url">
+        <get src="${maven-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}"
dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
     </target>
 
     <target name="checkout-source-via-svn">

Modified: manifoldcf/trunk/connectors/alfresco-webscript/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/build.xml?rev=1641629&r1=1641628&r2=1641629&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/build.xml Tue Nov 25 15:12:42 2014
@@ -30,7 +30,7 @@
 
     <import file="${mcf-dist}/connector-build.xml"/>
 
-    <property name="alfresco.indexer.version" value="0.6.6"/>
+    <property name="alfresco.indexer.version" value="0.7.0"/>
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
@@ -68,16 +68,12 @@
         </copy>
     </target>
 
-    <target name="setup-alfresco-indexer-url">
-        <property name="alfresco-indexer-base-url" value="https://repository-apachemaoo.forge.cloudbees.com/alfresco-indexer"/>
-    </target>
-
-    <target name="download-via-alfresco-indexer" depends="setup-alfresco-indexer-url">
-        <get src="${alfresco-indexer-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}"
dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
+    <target name="download-via-alfresco-indexer">
+        <get src="https://repo1.maven.org/maven2/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}"
dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
     </target>
 
     <target name="download-dependencies">
-        <property name="alfresco-package" value="org/alfresco/consulting/indexer"/>
+        <property name="alfresco-package" value="com/github/maoo/indexer"/>
         <antcall target="download-via-alfresco-indexer"><param name="project-path"
value="${alfresco-package}"/><param name="artifact-version" value="${alfresco.indexer.version}"/><param
name="target" value="test-materials-proprietary"/>
             <param name="artifact-name" value="alfresco-indexer-webscripts-war"/>
             <param name="artifact-type" value="war"/>

Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java?rev=1641629&r1=1641628&r2=1641629&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java
(original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java
Tue Nov 25 15:12:42 2014
@@ -16,10 +16,10 @@
  */
 package org.apache.manifoldcf.authorities.authorities.alfrescowebscript;
 
-import org.alfresco.consulting.indexer.client.AlfrescoClient;
-import org.alfresco.consulting.indexer.client.AlfrescoDownException;
-import org.alfresco.consulting.indexer.client.AlfrescoUser;
-import org.alfresco.consulting.indexer.client.WebScriptsAlfrescoClient;
+import com.github.maoo.indexer.client.AlfrescoClient;
+import com.github.maoo.indexer.client.AlfrescoDownException;
+import com.github.maoo.indexer.client.AlfrescoUser;
+import com.github.maoo.indexer.client.WebScriptsAlfrescoClient;
 import org.apache.manifoldcf.authorities.authorities.BaseAuthorityConnector;
 import org.apache.manifoldcf.authorities.interfaces.AuthorizationResponse;
 import org.apache.manifoldcf.authorities.system.Logging;

Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java?rev=1641629&r1=1641628&r2=1641629&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
(original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
Tue Nov 25 15:12:42 2014
@@ -16,10 +16,10 @@
  */
 package org.apache.manifoldcf.crawler.connectors.alfrescowebscript;
 
-import org.alfresco.consulting.indexer.client.AlfrescoClient;
-import org.alfresco.consulting.indexer.client.AlfrescoDownException;
-import org.alfresco.consulting.indexer.client.AlfrescoResponse;
-import org.alfresco.consulting.indexer.client.WebScriptsAlfrescoClient;
+import com.github.maoo.indexer.client.AlfrescoClient;
+import com.github.maoo.indexer.client.AlfrescoDownException;
+import com.github.maoo.indexer.client.AlfrescoResponse;
+import com.github.maoo.indexer.client.WebScriptsAlfrescoClient;
 import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
 import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
 import org.apache.manifoldcf.core.interfaces.*;

Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java?rev=1641629&r1=1641628&r2=1641629&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
(original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
Tue Nov 25 15:12:42 2014
@@ -16,16 +16,11 @@
  */
 package org.apache.manifoldcf.crawler.connectors.alfrescowebscript;
 
+import com.github.maoo.indexer.client.AlfrescoFilters;
 import com.google.common.collect.ImmutableMultimap;
-import org.alfresco.consulting.indexer.client.AlfrescoFilters;
-import org.apache.commons.io.IOUtils;
 import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
 import java.util.*;
 
 public class ConfigurationHandler {

Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnectorTest.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnectorTest.java?rev=1641629&r1=1641628&r2=1641629&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnectorTest.java
(original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnectorTest.java
Tue Nov 25 15:12:42 2014
@@ -16,7 +16,7 @@
  */
 package org.apache.manifoldcf.authorities.authorities.alfrescowebscript;
 
-import org.alfresco.consulting.indexer.client.AlfrescoClient;
+import com.github.maoo.indexer.client.AlfrescoClient;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java?rev=1641629&r1=1641628&r2=1641629&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java
(original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java
Tue Nov 25 15:12:42 2014
@@ -35,14 +35,13 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Date;
 
-import org.alfresco.consulting.indexer.client.AlfrescoClient;
-import org.alfresco.consulting.indexer.client.AlfrescoFilters;
-import org.alfresco.consulting.indexer.client.AlfrescoResponse;
+import com.github.maoo.indexer.client.AlfrescoClient;
+import com.github.maoo.indexer.client.AlfrescoFilters;
+import com.github.maoo.indexer.client.AlfrescoResponse;
 import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
 import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
 import org.apache.manifoldcf.core.interfaces.Specification;
 import org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector;
-import org.apache.manifoldcf.crawler.connectors.alfrescowebscript.AlfrescoConnector;
 import org.apache.manifoldcf.crawler.interfaces.IExistingVersions;
 import org.apache.manifoldcf.crawler.interfaces.IProcessActivity;
 import org.apache.manifoldcf.crawler.system.SeedingActivity;

Modified: manifoldcf/trunk/connectors/alfresco-webscript/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/pom.xml?rev=1641629&r1=1641628&r2=1641629&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/pom.xml Tue Nov 25 15:12:42 2014
@@ -46,7 +46,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <alfresco.indexer.version>0.6.6</alfresco.indexer.version>
+        <alfresco.indexer.version>0.7.0</alfresco.indexer.version>
     </properties>
 
     <repositories>
@@ -54,10 +54,6 @@
             <id>alfresco-release</id>
             <url>https://artifacts.alfresco.com/nexus/content/repositories/releases</url>
         </repository>
-        <repository>
-            <id>alfresco-indexer-release</id>
-            <url>https://repository-apachemaoo.forge.cloudbees.com/alfresco-indexer/</url>
-        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -164,7 +160,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <artifactId>alfresco-indexer-webscripts-war</artifactId>
-                                    <groupId>org.alfresco.consulting.indexer</groupId>
+                                    <groupId>com.github.maoo.indexer</groupId>
                                     <version>${alfresco.indexer.version}</version>
                                     <type>war</type>
                                     <overWrite>false</overWrite>
@@ -215,7 +211,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.alfresco.consulting.indexer</groupId>
+            <groupId>com.github.maoo.indexer</groupId>
             <artifactId>alfresco-indexer-client</artifactId>
             <version>${alfresco.indexer.version}</version>
         </dependency>



Mime
View raw message