svn commit: r1634071 - in /manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src: main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/

[ma...@apache.org]

Author: maoo
Date: Fri Oct 24 15:05:38 2014
New Revision: 1634071

URL: http://svn.apache.org/r1634071
Log:
#CONNECTOR-1060
Commented out getObfuscatedConfig() for password param (not working for APISanityHSQLDBIT)
Lowered maxTime in waitJobInactive(), so that test executes faster
getJobStatus() always returns a "running" status, even though there are no other entries to index in Alfresco (all 66 are fetched in the first call, as printed out by sysout statement)

Modified:
    manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
    manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java

Modified: manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java?rev=1634071&r1=1634070&r2=1634071&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java Fri Oct 24 15:05:38 2014
@@ -78,7 +78,20 @@ public class AlfrescoConnector extends B
     String storeProtocol = getConfig(config, "storeprotocol", "workspace");
     String storeId = getConfig(config, "storeid", "SpacesStore");
     String username = getConfig(config, "username", null);
-    String password = getObfuscatedConfig(config, "password", null);
+    //@TODO - not working from APISnityHSQLDBIT
+    //String password = getObfuscatedConfig(config, "password", null);
+    String password = getConfig(config, "password", null);
+
+    System.out.println("============");
+    System.out.println(protocol);
+    System.out.println(hostname);
+    System.out.println(port);
+    System.out.println(endpoint);
+    System.out.println(storeProtocol);
+    System.out.println(storeId);
+    System.out.println(username);
+    System.out.println(password);
+    System.out.println("============");
 
     alfrescoClient = new WebScriptsAlfrescoClient(protocol, hostname + ":" + port, endpoint,
         storeProtocol, storeId, username, password);
@@ -171,6 +184,8 @@ public class AlfrescoConnector extends B
         if (Logging.connectors != null && Logging.connectors.isDebugEnabled())
           Logging.connectors.debug(MessageFormat.format("Fetched and added {0} seed documents", new Object[]{new Integer(count)}));
 
+        System.out.println(MessageFormat.format("!!! Fetched and added {0} seed documents", new Object[]{new Integer(count)}));
+
         transactionIdsProcessed = response.getLastTransactionId() - lastTransactionId;
         aclChangesetsProcessed = response.getLastAclChangesetId() - lastAclChangesetId;
 

Modified: manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java?rev=1634071&r1=1634070&r2=1634071&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java (original)
+++ manifoldcf/branches/CONNECTORS-1060/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/APISanityHSQLDBIT.java Fri Oct 24 15:05:38 2014
@@ -276,7 +276,7 @@ public class APISanityHSQLDBIT extends B
 
       // Now, start the job, and wait until it completes.
       startJob(jobIDString);
-      waitJobInactive(jobIDString, 360000L);
+      waitJobInactive(jobIDString, 12000L);
 
       // Check to be sure we actually processed the right number of documents.
       // The test data area has 3 documents and one directory, and we have to count the root directory too.
@@ -331,12 +331,6 @@ public class APISanityHSQLDBIT extends B
     while (i < result.getChildCount()) {
       ConfigurationNode resultNode = result.findChild(i++);
 
-      System.out.println("!!! value: " + resultNode.getValue());
-      while (resultNode.getAttributes().hasNext()) {
-        String str = resultNode.getAttributes().next();
-        System.out.println("!!! attr: " + str);
-      }
-
       if (resultNode.getType().equals("error")) {
         throw new Exception(resultNode.getValue());
       } else if (resultNode.getType().equals("jobstatus"))
@@ -345,8 +339,12 @@ public class APISanityHSQLDBIT extends B
         while (j < resultNode.getChildCount())
         {
           ConfigurationNode childNode = resultNode.findChild(j++);
-          if (childNode.getType().equals("status"))
+          if (childNode.getType().equals("status")) {
             status = childNode.getValue();
+            System.out.println("Type: "+resultNode.getType());
+            System.out.println("Status: "+status);
+          }
+
         }
       }
     }