svn commit: r1629868 - in /manifoldcf/trunk/connectors/meridio: ./ connector/src/main/java/org/apache/manifoldcf/authorities/ connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ connector/src/main/java/org/apache/manifoldcf/authoriti...

[kw...@apache.org]

Author: kwright
Date: Tue Oct  7 12:32:05 2014
New Revision: 1629868

URL: http://svn.apache.org/r1629868
Log:
Fix CONNECTORS-1065 for meridio connector

Added:
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java
      - copied, changed from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/Messages.java
      - copied, changed from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/Messages.java
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/DMSearchResults.java
      - copied, changed from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/DMSearchResults.java
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioDataSetException.java
      - copied, changed from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioDataSetException.java
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java
      - copied, changed from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapperException.java
      - copied, changed from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapperException.java
    manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/
    manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/
    manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/meridio/
    manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/meridio/common_en_US.properties
      - copied unchanged from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_en_US.properties
    manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/meridio/common_ja_JP.properties
      - copied unchanged from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_ja_JP.properties
    manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/meridio/common_zh_CN.properties
      - copied unchanged from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_zh_CN.properties
Removed:
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/
    manifoldcf/trunk/connectors/meridio/connector/src/main/resources/org/
Modified:
    manifoldcf/trunk/connectors/meridio/build.xml
    manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java

Modified: manifoldcf/trunk/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/build.xml?rev=1629868&r1=1629867&r2=1629868&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/build.xml (original)
+++ manifoldcf/trunk/connectors/meridio/build.xml Tue Oct  7 12:32:05 2014
@@ -104,7 +104,7 @@
     <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
         <antcall target="general-add-authority-connector">
             <param name="connector-label" value="Meridio"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.meridio.MeridioAuthority"/>
+            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.meridio.MeridioAuthority"/>
         </antcall>
         <antcall target="general-add-repository-connector">
             <param name="connector-label" value="Meridio"/>

Copied: manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java (from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java?p2=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java&p1=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java&r1=1629377&r2=1629868&rev=1629868&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java (original)
+++ manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java Tue Oct  7 12:32:05 2014
@@ -16,12 +16,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.crawler.connectors.meridio;
+package org.apache.manifoldcf.authorities.authorities.meridio;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.crawler.connectors.meridio.DMDataSet.DMDataSet;
-import org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper.MeridioDataSetException;
-import org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper.MeridioWrapper;
+import org.apache.manifoldcf.meridio.MeridioDataSetException;
+import org.apache.manifoldcf.meridio.MeridioWrapper;
 import org.apache.manifoldcf.crawler.connectors.meridio.RMDataSet.RMDataSet;
 import org.tempuri.GroupResult;
 import org.apache.manifoldcf.authorities.system.Logging;

Copied: manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/Messages.java (from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/Messages.java)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/Messages.java?p2=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/Messages.java&p1=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/Messages.java&r1=1629377&r2=1629868&rev=1629868&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/Messages.java (original)
+++ manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/Messages.java Tue Oct  7 12:32:05 2014
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.crawler.connectors.meridio;
+package org.apache.manifoldcf.authorities.authorities.meridio;
 
 import java.util.Locale;
 import java.util.Map;
@@ -25,8 +25,8 @@ import org.apache.manifoldcf.core.interf
 
 public class Messages extends org.apache.manifoldcf.ui.i18n.Messages
 {
-  public static final String DEFAULT_BUNDLE_NAME="org.apache.manifoldcf.crawler.connectors.meridio.common";
-  public static final String DEFAULT_PATH_NAME="org.apache.manifoldcf.crawler.connectors.meridio";
+  public static final String DEFAULT_BUNDLE_NAME="org.apache.manifoldcf.authorities.authorities.meridio.common";
+  public static final String DEFAULT_PATH_NAME="org.apache.manifoldcf.authorities.authorities.meridio";
   
   /** Constructor - do no instantiate
   */

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=1629868&r1=1629867&r2=1629868&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 Tue Oct  7 12:32:05 2014
@@ -24,9 +24,9 @@ import com.meridio.www.MeridioDMWS.DmSea
 import com.meridio.www.MeridioDMWS.DmVersionInfo;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
-import org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper.DMSearchResults;
-import org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper.MeridioDataSetException;
-import org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper.MeridioWrapper;
+import org.apache.manifoldcf.meridio.DMSearchResults;
+import org.apache.manifoldcf.meridio.MeridioDataSetException;
+import org.apache.manifoldcf.meridio.MeridioWrapper;
 import org.apache.manifoldcf.crawler.interfaces.*;
 import org.apache.manifoldcf.crawler.system.Logging;
 import org.apache.manifoldcf.crawler.system.ManifoldCF;

Copied: manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/DMSearchResults.java (from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/DMSearchResults.java)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/DMSearchResults.java?p2=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/DMSearchResults.java&p1=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/DMSearchResults.java&r1=1629377&r2=1629868&rev=1629868&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/DMSearchResults.java (original)
+++ manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/DMSearchResults.java Tue Oct  7 12:32:05 2014
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper;
+package org.apache.manifoldcf.meridio;
 
 import org.apache.manifoldcf.crawler.connectors.meridio.DMDataSet.*;
 

Copied: manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioDataSetException.java (from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioDataSetException.java)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioDataSetException.java?p2=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioDataSetException.java&p1=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioDataSetException.java&r1=1629377&r2=1629868&rev=1629868&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioDataSetException.java (original)
+++ manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioDataSetException.java Tue Oct  7 12:32:05 2014
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper;
+package org.apache.manifoldcf.meridio;
 
 public class MeridioDataSetException extends Exception
 {

Copied: manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java (from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java?p2=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java&p1=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java&r1=1629377&r2=1629868&rev=1629868&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java (original)
+++ manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java Tue Oct  7 12:32:05 2014
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper;
+package org.apache.manifoldcf.meridio;
 
 import java.net.*;
 import java.rmi.RemoteException;

Copied: manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapperException.java (from r1629377, manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapperException.java)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapperException.java?p2=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapperException.java&p1=manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapperException.java&r1=1629377&r2=1629868&rev=1629868&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapperException.java (original)
+++ manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapperException.java Tue Oct  7 12:32:05 2014
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper;
+package org.apache.manifoldcf.meridio;
 
 public class MeridioWrapperException extends Exception
 {