manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1571006 - in /manifoldcf/trunk: connectors/ connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/ connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/ connector...
Date Sun, 23 Feb 2014 13:32:05 GMT
Author: kwright
Date: Sun Feb 23 13:32:04 2014
New Revision: 1571006

URL: http://svn.apache.org/r1571006
Log:
Remove deprecation warnings coming from MCF.  Part of CONNECTORS-886.

Modified:
    manifoldcf/trunk/connectors/connector-build.xml
    manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
    manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
    manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
    manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
    manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
    manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
    manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
    manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
    manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java
    manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
    manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
    manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java
    manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
    manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java
    manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
    manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java
    manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
    manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
    manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
    manifoldcf/trunk/framework/build.xml

Modified: manifoldcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/connector-build.xml?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/connector-build.xml (original)
+++ manifoldcf/trunk/connectors/connector-build.xml Sun Feb 23 13:32:04 2014
@@ -206,7 +206,7 @@
 
     <target name="compile-stubs" depends="build-stubs-check" if="buildStubs">
         <mkdir dir="build/stubclasses"/>
-        <javac srcdir="build-stub/src/main/java" destdir="build/stubclasses" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="build-stub/src/main/java" destdir="build/stubclasses" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
             </classpath>
         </javac>
@@ -298,7 +298,7 @@
 
     <target name="compile-wsdls" depends="has-wsdls-check" if="hasWSDLs">
         <mkdir dir="build/wsdlclasses"/>
-        <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+        <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <fileset dir="../../lib">
                     <include name="axis*.jar"/>
@@ -320,7 +320,7 @@
 
     <target name="compile-xsds" depends="has-xsds-check" if="hasXSDs">
         <mkdir dir="build/xsdclasses"/>
-        <javac srcdir="build/xsdjava" destdir="build/xsdclasses" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+        <javac srcdir="build/xsdjava" destdir="build/xsdclasses" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <fileset dir="../../lib">
                     <include name="castor*.jar"/>
@@ -397,7 +397,7 @@
     
     <target name="compile-server" depends="compile-interface,compile-implementation,compile-rmic,has-RMI-check" if="hasRMI">
         <mkdir dir="build/server/classes"/>
-        <javac srcdir="server/src/main/java" destdir="build/server/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="server/src/main/java" destdir="build/server/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <pathelement location="build/interface/classes"/>
                 <pathelement location="build/implementation/classes"/>
@@ -409,7 +409,7 @@
 
     <target name="compile-registry" depends="compile-interface,has-RMI-check" if="hasRMI">
         <mkdir dir="build/registry/classes"/>
-        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <pathelement location="build/interface/classes"/>
             </classpath>
@@ -418,7 +418,7 @@
 
     <target name="compile-connector" depends="compile-stubs,compile-connector-native2ascii,compile-connector-resources,compile-wsdls,compile-xsds,compile-interface,compile-rmic,precompile-check" if="canBuild">
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <path refid="connector-classpath"/>
             </classpath>
@@ -427,7 +427,7 @@
 
     <target name="compile-implementation" depends="compile-stubs,compile-interface,has-RMI-check" if="hasRMI">
         <mkdir dir="build/implementation/classes"/>
-        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <path refid="implementation-classpath"/>
             </classpath>
@@ -436,7 +436,7 @@
 
     <target name="compile-interface" depends="has-RMI-check" if="hasRMI">
         <mkdir dir="build/interface/classes"/>
-        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <path refid="interface-classpath"/>
             </classpath>
@@ -452,7 +452,7 @@
 
     <target name="compile-tests" depends="compile-connector,compile-test-resources,has-tests-check" if="hasTests">
         <mkdir dir="build/connector-tests/classes"/>
-        <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <path refid="connector-test-classpath"/>
             </classpath>

Modified: manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java (original)
+++ manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java Sun Feb 23 13:32:04 2014
@@ -1683,7 +1683,7 @@ public class DCTM extends org.apache.man
               strarrACL[0] = docbaseName + ":" + object.getACLDomain() + "." + object.getACLName();
               if (Logging.connectors.isDebugEnabled())
                 Logging.connectors.debug("DCTM: Processing document (" + objName + ") with ACL=" + strarrACL[0] + " and size=" + object.getContentSize() + " bytes.");
-              rval.setACL(strarrACL);
+              rval.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,strarrACL);
             }
             else if (acls != null)
             {
@@ -1694,7 +1694,7 @@ public class DCTM extends org.apache.man
                 forcedAcls[z] = (String)acls.get(z);
                 z++;
               }
-              rval.setACL(forcedAcls);
+              rval.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,forcedAcls);
 
 
               if (Logging.connectors.isDebugEnabled())
@@ -1704,7 +1704,7 @@ public class DCTM extends org.apache.man
             if (denyAcl != null)
             {
               String[] denyAcls = new String[]{denyAcl};
-              rval.setDenyACL(denyAcls);
+              rval.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAcls);
             }
 
             contentType = object.getContentType();

Modified: manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java (original)
+++ manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java Sun Feb 23 13:32:04 2014
@@ -930,10 +930,10 @@ public class DropboxRepositoryConnector 
             for (int j = 0; j < aclArray.length; j++) {
               aclArray[j] = (String)acls.get(j);
             }
-            rd.setACL(aclArray);
+            rd.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,aclArray);
             if (denyAclBuffer.length() > 0) {
               String[] denyAclArray = new String[]{denyAclBuffer.toString()};
-              rd.setDenyACL(denyAclArray);
+              rd.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAclArray);
             }
 
             // Length in bytes

Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java Sun Feb 23 13:32:04 2014
@@ -443,6 +443,8 @@ public class ElasticSearchConnector exte
     String[] denyAcls = null;
     String[] shareAcls = null;
     String[] shareDenyAcls = null;
+    String[] parentAcls = null;
+    String[] parentDenyAcls = null;
     Iterator<String> a = document.securityTypesIterator();
     while (a.hasNext())
     {
@@ -459,6 +461,11 @@ public class ElasticSearchConnector exte
         shareAcls = convertedAcls;
         shareDenyAcls = convertedDenyAcls;
       }
+      else if (securityType.equals(RepositoryDocument.SECURITY_TYPE_PARENT))
+      {
+        parentAcls = convertedAcls;
+        parentDenyAcls = convertedDenyAcls;
+      }
       else
       {
         // Don't know how to deal with it
@@ -470,7 +477,7 @@ public class ElasticSearchConnector exte
     ElasticSearchIndex oi = new ElasticSearchIndex(client, config);
     try
     {
-      oi.execute(documentURI, document, inputStream, acls, denyAcls, shareAcls, shareDenyAcls);
+      oi.execute(documentURI, document, inputStream, acls, denyAcls, shareAcls, shareDenyAcls, parentAcls, parentDenyAcls);
       if (oi.getResult() != Result.OK)
         return DOCUMENTSTATUS_REJECTED;
       return DOCUMENTSTATUS_ACCEPTED;

Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java Sun Feb 23 13:32:04 2014
@@ -63,9 +63,11 @@ public class ElasticSearchIndex extends 
     private final String[] denyAcls;
     private final String[] shareAcls;
     private final String[] shareDenyAcls;
+    private final String[] parentAcls;
+    private final String[] parentDenyAcls;
 
     public IndexRequestEntity(RepositoryDocument document, InputStream inputStream,
-      String[] acls, String[] denyAcls, String[] shareAcls, String[] shareDenyAcls)
+      String[] acls, String[] denyAcls, String[] shareAcls, String[] shareDenyAcls, String[] parentAcls, String[] parentDenyAcls)
       throws ManifoldCFException
     {
       this.document = document;
@@ -74,6 +76,8 @@ public class ElasticSearchIndex extends 
       this.denyAcls = denyAcls;
       this.shareAcls = shareAcls;
       this.shareDenyAcls = shareDenyAcls;
+      this.parentAcls = parentAcls;
+      this.parentDenyAcls = parentDenyAcls;
     }
 
     @Override
@@ -120,6 +124,7 @@ public class ElasticSearchIndex extends 
 
         needComma = writeACLs(pw, needComma, "document", acls, denyAcls);
         needComma = writeACLs(pw, needComma, "share", shareAcls, shareDenyAcls);
+        needComma = writeACLs(pw, needComma, "parent", parentAcls, parentDenyAcls);
 
         if(inputStream!=null){
           if(needComma){
@@ -255,7 +260,8 @@ public class ElasticSearchIndex extends 
   *@return false to indicate that the document was rejected.
   */
   public boolean execute(String documentURI, RepositoryDocument document, 
-    InputStream inputStream, String[] acls, String[] denyAcls, String[] shareAcls, String[] shareDenyAcls)
+    InputStream inputStream,
+    String[] acls, String[] denyAcls, String[] shareAcls, String[] shareDenyAcls, String[] parentAcls, String[] parentDenyAcls)
     throws ManifoldCFException, ServiceInterruption
   {
     String idField;
@@ -270,7 +276,7 @@ public class ElasticSearchIndex extends 
 
     StringBuffer url = getApiUrl(config.getIndexType() + "/" + idField, false);
     HttpPut put = new HttpPut(url.toString());
-    put.setEntity(new IndexRequestEntity(document, inputStream, acls, denyAcls, shareAcls, shareDenyAcls));
+    put.setEntity(new IndexRequestEntity(document, inputStream, acls, denyAcls, shareAcls, shareDenyAcls, parentAcls, parentDenyAcls));
     if (call(put) == false)
       return false;
     if ("true".equals(checkJson(jsonStatus)))

Modified: manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java (original)
+++ manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Sun Feb 23 13:32:04 2014
@@ -1314,7 +1314,7 @@ public class FilenetConnector extends or
                       acls[j] = (String)aclValues.get(j);
                       j++;
                     }
-                    rd.setACL(acls);
+                    rd.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,acls);
                   }
                   if (denyAclValues != null)
                   {
@@ -1325,7 +1325,7 @@ public class FilenetConnector extends or
                       denyAcls[j] = (String)denyAclValues.get(j);
                       j++;
                     }
-                    rd.setDenyACL(denyAcls);
+                    rd.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAcls);
                   }
 
                   // Ingest

Modified: manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java (original)
+++ manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java Sun Feb 23 13:32:04 2014
@@ -392,13 +392,11 @@ public class GenericConnector extends Ba
           for (int j = 0; j < item.auth.size(); j++) {
             acl[j] = item.auth.get(j);
           }
-          doc.setACL(acl);
-          doc.setDenyACL(new String[]{defaultAuthorityDenyToken});
+          doc.setSecurity(RepositoryDocument.SECURITY_TYPE_DOCUMENT,acl,new String[]{defaultAuthorityDenyToken});
         }
       } else {
         if (acls.length > 0) {
-          doc.setACL(acls);
-          doc.setDenyACL(new String[]{defaultAuthorityDenyToken});
+          doc.setSecurity(RepositoryDocument.SECURITY_TYPE_DOCUMENT,acls,new String[]{defaultAuthorityDenyToken});
         }
       }
       if (item.content != null) {

Modified: manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java (original)
+++ manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java Sun Feb 23 13:32:04 2014
@@ -1090,10 +1090,10 @@ public class GoogleDriveRepositoryConnec
               for (int j = 0; j < aclArray.length; j++) {
                 aclArray[j] = (String)acls.get(j);
               }
-              rd.setACL(aclArray);
+              rd.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,aclArray);
               if (denyAclBuffer.length() > 0) {
                 String[] denyAclArray = new String[]{denyAclBuffer.toString()};
-                rd.setDenyACL(denyAclArray);
+                rd.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAclArray);
               }
 
               // Now do standard stuff

Modified: manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java (original)
+++ manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java Sun Feb 23 13:32:04 2014
@@ -157,15 +157,40 @@ public class HttpPoster
     throws ManifoldCFException, ServiceInterruption
   {
     StringBuilder aclXml = new StringBuilder();
-    writeACLs(aclXml,"share",document.getShareACL(),document.getShareDenyACL(),authorityNameString,activities);
-    int directoryCount = document.countDirectoryACLs();
-    int q = 0;
-    while (q < directoryCount)
+    Iterator<String> securityTypeIterator = document.securityTypesIterator();
+    String[] shareAcls = null;
+    String[] shareDenyAcls = null;
+    String[] documentAcls = null;
+    String[] documentDenyAcls = null;
+    String[] parentAcls = null;
+    String[] parentDenyAcls = null;
+    while (securityTypeIterator.hasNext())
     {
-      writeACLs(aclXml,"directory",document.getDirectoryACL(q),document.getDirectoryDenyACL(q),authorityNameString,activities);
-      q++;
+      String securityType = securityTypeIterator.next();
+      if (securityType.equals(RepositoryDocument.SECURITY_TYPE_SHARE))
+      {
+        shareAcls = document.getSecurityACL(securityType);
+        shareDenyAcls = document.getSecurityDenyACL(securityType);
+      }
+      else if (securityType.equals(RepositoryDocument.SECURITY_TYPE_DOCUMENT))
+      {
+        documentAcls = document.getSecurityACL(securityType);
+        documentDenyAcls = document.getSecurityDenyACL(securityType);
+      }
+      else if (securityType.equals(RepositoryDocument.SECURITY_TYPE_PARENT))
+      {
+        parentAcls = document.getSecurityACL(securityType);
+        parentDenyAcls = document.getSecurityDenyACL(securityType);
+      }
+      else
+        // Can't accept the document, because we don't know how to secure it
+        return false;
     }
-    writeACLs(aclXml,"file",document.getACL(),document.getDenyACL(),authorityNameString,activities);
+
+    writeACLs(aclXml,"share",shareAcls,shareDenyAcls,authorityNameString,activities);
+    writeACLs(aclXml,"directory",parentAcls,parentDenyAcls,authorityNameString,activities);
+    writeACLs(aclXml,"file",documentAcls,documentDenyAcls,authorityNameString,activities);
+
     if (aclXml.length() > 0)
       aclXml.append("</document-acl>");
     String aclXmlString = aclXml.toString();

Modified: manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java (original)
+++ manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java Sun Feb 23 13:32:04 2014
@@ -48,8 +48,8 @@ public class GetConnectionInfo
 
     try
     {
-      ManifoldCF.initializeEnvironment();
       IThreadContext tc = ThreadContextFactory.make();
+      ManifoldCF.initializeEnvironment(tc);
       IRepositoryConnectionManager connectionManager = RepositoryConnectionManagerFactory.make(tc);
       IRepositoryConnection connection = connectionManager.load(connectionName);
       if (connection == null)

Modified: manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java (original)
+++ manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java Sun Feb 23 13:32:04 2014
@@ -1397,8 +1397,7 @@ public class SharedDriveConnector extend
       }
 
       // set share acls
-      rd.setShareACL(shareAllow);
-      rd.setShareDenyACL(shareDeny);
+      rd.setSecurity(RepositoryDocument.SECURITY_TYPE_SHARE,shareAllow,shareDeny);
     }
     if (startPosition < version.length() && version.charAt(startPosition++) == '+')
     {
@@ -1423,7 +1422,7 @@ public class SharedDriveConnector extend
       }
 
       // set parent folder acls
-      rd.addDirectoryACLs(parentAllow, parentDeny);
+      rd.setSecurity(RepositoryDocument.SECURITY_TYPE_PARENT,parentAllow,parentDeny);
     }
     if (startPosition < version.length() && version.charAt(startPosition++) == '+')
     {
@@ -1448,8 +1447,7 @@ public class SharedDriveConnector extend
       }
 
       // set native file acls
-      rd.setACL(allow);
-      rd.setDenyACL(deny);
+      rd.setSecurity(RepositoryDocument.SECURITY_TYPE_DOCUMENT,allow,deny);
     }
     return startPosition;
   }

Modified: manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java (original)
+++ manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java Sun Feb 23 13:32:04 2014
@@ -1567,10 +1567,7 @@ public class JDBCConnector extends org.a
       }
     }
 
-    if (accessAcls != null)
-      rd.setACL(accessAcls);
-    if (denyAcls != null)
-      rd.setDenyACL(denyAcls);
+    rd.setSecurity(RepositoryDocument.SECURITY_TYPE_DOCUMENT,accessAcls,denyAcls);
 
   }
   

Modified: manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java (original)
+++ manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java Sun Feb 23 13:32:04 2014
@@ -950,10 +950,10 @@ public class JiraRepositoryConnector ext
             for (int j = 0; j < aclArray.length; j++) {
               aclArray[j] = (String)acls.get(j);
             }
-            rd.setACL(aclArray);
+            rd.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,aclArray);
             if (denyAclBuffer.length() > 0) {
               String[] denyAclArray = new String[]{denyAclBuffer.toString()};
-              rd.setDenyACL(denyAclArray);
+              rd.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAclArray);
             }
 
             // Now do standard stuff

Modified: manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java (original)
+++ manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java Sun Feb 23 13:32:04 2014
@@ -50,8 +50,8 @@ public class GetConnectionInfo
 
     try
     {
-      ManifoldCF.initializeEnvironment();
       IThreadContext tc = ThreadContextFactory.make();
+      ManifoldCF.initializeEnvironment(tc);
       IRepositoryConnectionManager connectionManager = RepositoryConnectionManagerFactory.make(tc);
       IRepositoryConnection connection = connectionManager.load(connectionName);
       if (connection == null)

Modified: manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original)
+++ manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Sun Feb 23 13:32:04 2014
@@ -4375,14 +4375,14 @@ public class LivelinkConnector extends o
                   aclArray[j] = (String)acls.get(j);
                   j++;
                 }
-                rd.setACL(aclArray);
 
                 StringBuilder denyBuffer = new StringBuilder();
                 startPos = unpack(denyBuffer,version,startPos,'+');
                 String denyAcl = denyBuffer.toString();
                 String[] denyAclArray = new String[1];
                 denyAclArray[0] = denyAcl;
-                rd.setDenyACL(denyAclArray);
+                
+                rd.setSecurity(RepositoryDocument.SECURITY_TYPE_DOCUMENT,aclArray,denyAclArray);
               }
             }
 

Modified: manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java (original)
+++ manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java Sun Feb 23 13:32:04 2014
@@ -1326,11 +1326,7 @@ public class MeridioConnector extends or
               denyAcls = null;
           }
 
-          if (allowAcls != null)
-            repositoryDocument.setACL(allowAcls);
-
-          if (denyAcls != null)
-            repositoryDocument.setDenyACL(denyAcls);
+          repositoryDocument.setSecurity(RepositoryDocument.SECURITY_TYPE_DOCUMENT,allowAcls,denyAcls);
 
           /*=================================================================
           * Get the object's content, and ingest the document

Modified: manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java Sun Feb 23 13:32:04 2014
@@ -47,8 +47,8 @@ public class GetSeedList
 
     try
     {
-      ManifoldCF.initializeEnvironment();
       IThreadContext tc = ThreadContextFactory.make();
+      ManifoldCF.initializeEnvironment(tc);
       IJobManager jobManager = JobManagerFactory.make(tc);
       IJobDescription desc = jobManager.load(new Long(jobString));
 

Modified: manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java Sun Feb 23 13:32:04 2014
@@ -1361,13 +1361,13 @@ public class RSSConnector extends org.ap
               aclArray[j] = (String)acls.get(j);
               j++;
             }
-            rd.setACL(aclArray);
+            rd.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,aclArray);
 
             // Deny acl too
             if (denyAclBuffer.length() > 0)
             {
               String[] denyAclArray = new String[]{denyAclBuffer.toString()};
-              rd.setDenyACL(denyAclArray);
+              rd.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAclArray);
             }
 
             // Grab metadata

Modified: manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java Sun Feb 23 13:32:04 2014
@@ -47,8 +47,8 @@ public class SetSeedList
 
     try
     {
-      ManifoldCF.initializeEnvironment();
       IThreadContext tc = ThreadContextFactory.make();
+      ManifoldCF.initializeEnvironment(tc);
       IJobManager jobManager = JobManagerFactory.make(tc);
       IJobDescription desc = jobManager.load(new Long(jobString));
 

Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Sun Feb 23 13:32:04 2014
@@ -2120,7 +2120,7 @@ public class SharePointRepository extend
         Logging.connectors.debug( sb.toString() );
       }
 
-      data.setACL( actualAcls );
+      data.setSecurityACL( RepositoryDocument.SECURITY_TYPE_DOCUMENT, actualAcls );
     }
 
     if (denyAcls != null)
@@ -2142,7 +2142,7 @@ public class SharePointRepository extend
         Logging.connectors.debug( sb.toString() );
       }
 
-      data.setDenyACL(actualDenyAcls);
+      data.setSecurityDenyACL( RepositoryDocument.SECURITY_TYPE_DOCUMENT, actualDenyAcls);
     }
   }
 

Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Sun Feb 23 13:32:04 2014
@@ -533,7 +533,7 @@ public class HttpPoster
       // Reject documents that have security we don't know how to deal with in the Solr plugin!!  Only safe thing to do.
       if (!aclType.equals(RepositoryDocument.SECURITY_TYPE_DOCUMENT) &&
         !aclType.equals(RepositoryDocument.SECURITY_TYPE_SHARE) &&
-        !aclType.startsWith(RepositoryDocument.SECURITY_TYPE_DIRECTORY_LEVEL))
+        !aclType.startsWith(RepositoryDocument.SECURITY_TYPE_PARENT))
         return false;
     }
 

Modified: manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java (original)
+++ manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java Sun Feb 23 13:32:04 2014
@@ -3869,9 +3869,7 @@ public class WikiConnector extends org.a
                   String[] denyACL = new String[]{
                     defaultAuthorityDenyToken
                   };
-                  rd.setDenyACL(denyACL);
-
-                  rd.setACL(allowACL);
+                  rd.setSecurity(RepositoryDocument.SECURITY_TYPE_DOCUMENT,allowACL,denyACL);
                 }
 
                 activities.ingestDocument(documentIdentifier,documentVersion,fullURL,rd);

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1571006&r1=1571005&r2=1571006&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sun Feb 23 13:32:04 2014
@@ -90,7 +90,7 @@
     
     <target name="compile-core">
         <mkdir dir="build/core/classes"/>
-        <javac srcdir="core/src/main/java" destdir="build/core/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="core/src/main/java" destdir="build/core/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
             </classpath>
@@ -99,7 +99,7 @@
 
     <target name="compile-ui-core" depends="compile-core">
         <mkdir dir="build/ui-core/classes"/>
-        <javac srcdir="ui-core/src/main/java" destdir="build/ui-core/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="ui-core/src/main/java" destdir="build/ui-core/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -110,7 +110,7 @@
 
     <target name="compile-agents" depends="compile-core">
         <mkdir dir="build/agents/classes"/>
-        <javac srcdir="agents/src/main/java" destdir="build/agents/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="agents/src/main/java" destdir="build/agents/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -120,7 +120,7 @@
 
     <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" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="pull-agent/src/main/java" destdir="build/pull-agent/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -131,7 +131,7 @@
 
     <target name="compile-jetty-runner" depends="compile-core,compile-agents">
         <mkdir dir="build/jetty-runner/classes"/>
-        <javac srcdir="jetty-runner/src/main/java" destdir="build/jetty-runner/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="jetty-runner/src/main/java" destdir="build/jetty-runner/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -143,7 +143,7 @@
 
     <target name="compile-script-engine" depends="compile-core">
         <mkdir dir="build/script-engine/classes"/>
-        <javac srcdir="script-engine/src/main/java" destdir="build/script-engine/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="script-engine/src/main/java" destdir="build/script-engine/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -153,7 +153,7 @@
 
     <target name="compile-authority-servlet" depends="compile-core,compile-agents,compile-pull-agent">
         <mkdir dir="build/authority-servlet/classes"/>
-        <javac srcdir="authority-servlet/src/main/java" destdir="build/authority-servlet/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="authority-servlet/src/main/java" destdir="build/authority-servlet/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -165,7 +165,7 @@
 
     <target name="compile-authority-service" depends="compile-core,compile-agents,compile-pull-agent,compile-authority-servlet">
         <mkdir dir="build/authority-service/classes"/>
-        <javac srcdir="authority-service/src/main/java" destdir="build/authority-service/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="authority-service/src/main/java" destdir="build/authority-service/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -178,7 +178,7 @@
 
     <target name="compile-api-servlet" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent">
         <mkdir dir="build/api-servlet/classes"/>
-        <javac srcdir="api-servlet/src/main/java" destdir="build/api-servlet/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="api-servlet/src/main/java" destdir="build/api-servlet/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -191,7 +191,7 @@
 
     <target name="compile-api-service" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent,compile-api-servlet">
         <mkdir dir="build/api-service/classes"/>
-        <javac srcdir="api-service/src/main/java" destdir="build/api-service/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="api-service/src/main/java" destdir="build/api-service/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -205,7 +205,7 @@
 
     <target name="compile-combined-service" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent,compile-api-servlet,compile-authority-servlet">
         <mkdir dir="build/combined-service/classes"/>
-        <javac srcdir="combined-service/src/main/java" destdir="build/combined-service/classes" target="1.6" source="1.6" encoding="utf-8" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="combined-service/src/main/java" destdir="build/combined-service/classes" deprecation="true" target="1.6" source="1.6" encoding="utf-8" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -220,7 +220,7 @@
 
     <target name="compile-crawler-ui" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent">
         <mkdir dir="build/crawler-ui/classes"/>
-        <javac srcdir="crawler-ui/src/main/java" destdir="build/crawler-ui/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="crawler-ui/src/main/java" destdir="build/crawler-ui/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -246,7 +246,7 @@
         <jasper2 validateXml="false" uriroot="crawler-ui/src/main/webapp" webXmlFragment="build/crawler-ui/web-generated.xml" outputDir="build/crawler-ui/java" /> 
         <!-- Compile java classes -->
         <mkdir dir="build/crawler-ui/classes"/>
-        <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath id="classpath">
                 <pathelement location="${java.home}/../lib/tools.jar"/>
                 <path refid="framework-classpath"/>
@@ -1368,7 +1368,7 @@
 
     <target name="compile-core-tests" depends="compile-core">
         <mkdir dir="build/core-tests/classes"/>
-        <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -1378,7 +1378,7 @@
 
     <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" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -1390,7 +1390,7 @@
 
     <target name="compile-pull-agent-tests" depends="compile-agents-tests,compile-pull-agent">
         <mkdir dir="build/pull-agent-tests/classes"/>
-        <javac srcdir="pull-agent/src/test/java" destdir="build/pull-agent-tests/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="pull-agent/src/test/java" destdir="build/pull-agent-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -1404,7 +1404,7 @@
 
     <target name="compile-script-engine-tests" depends="compile-core,compile-script-engine">
         <mkdir dir="build/script-engine-tests/classes"/>
-        <javac srcdir="script-engine/src/test/java" destdir="build/script-engine-tests/classes" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+        <javac srcdir="script-engine/src/test/java" destdir="build/script-engine-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>



Mime
View raw message