Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/Restrictions.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/Restrictions.java?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/Restrictions.java
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/Restrictions.java
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,117 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.manifoldcf.crawler.connectors.confluence.v6.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import 
org.apache.manifoldcf.crawler.connectors.confluence.v6.model.builder.ConfluenceResourceBuilder;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class Restrictions extends ConfluenceResource {
+
+  protected static final String KEY_READ = "read";
+  protected static final String KEY_OPERATION = "operation";
+  protected static final String KEY_RESTRICTIONS = "restrictions";
+  protected static final String KEY_USER = "user";
+  protected static final String KEY_RESULTS = "results";
+  protected static final String KEY_USERNAME = "username";
+  protected static final String KEY_USER_KEY = "userKey";
+  protected static final String KEY_DISPLAY_NAME = "displayName";
+  protected static final String KEY_GROUP = "group";
+  protected static final String KEY_NAME = "name";
+  protected static final String KEY_TYPE = "type";
+  protected static final String KEY_UPDATE = "update";
+  
+  protected ReadRestrictions readRestrictions;
+  
+  public ReadRestrictions getReadRestrictions() {
+    return readRestrictions;
+  }
+
+  public Restrictions() {
+    
+  }
+  
+  public static ConfluenceResourceBuilder<? extends Restrictions> builder() {
+    return new RestrictionsBuilder();
+  }
+  
+  public class ReadRestrictions {
+    protected final List<User> users = new ArrayList<User>();
+    protected final List<Group> groups = new ArrayList<Group>();
+    
+    public List<User> getUsers() {
+      return users;
+    }
+
+    public List<Group> getGroups() {
+      return groups;
+    }
+
+    protected ReadRestrictions() {
+      
+    }
+    
+    protected ReadRestrictions(final JSONObject readRestrictionsJson) {
+      // Get users
+      if(readRestrictionsJson.get(KEY_USER) != null) {
+        JSONObject jsonUsers = (JSONObject) readRestrictionsJson.get(KEY_USER);
+        JSONArray usersResults = (JSONArray) jsonUsers.get(KEY_RESULTS);
+        for(int i=0; i<usersResults.size(); i++) {
+          JSONObject jsonUser = (JSONObject) usersResults.get(i);
+          User user = User.builder().fromJson(jsonUser);
+          users.add(user);
+        }
+      }
+      
+      //Get Groups
+      if(readRestrictionsJson.get(KEY_GROUP) != null) {
+        JSONObject jsonGroups = (JSONObject) 
readRestrictionsJson.get(KEY_GROUP);
+        JSONArray groupsResults = (JSONArray) jsonGroups.get(KEY_RESULTS);
+        for(int i=0; i<groupsResults.size(); i++) {
+          JSONObject jsonGroup = (JSONObject) groupsResults.get(i);
+          Group group = Group.builder().fromJson(jsonGroup);
+          groups.add(group);
+        }
+      }
+    }
+  }
+
+  public static class RestrictionsBuilder implements 
ConfluenceResourceBuilder<Restrictions>{
+
+    @Override
+    public Restrictions fromJson(JSONObject restrictionsJson) {
+      return fromJson(restrictionsJson, new Restrictions());
+    }
+
+    @Override
+    public Restrictions fromJson(JSONObject restrictionsJson, Restrictions 
restrictions) {
+      restrictions.readRestrictions = restrictions.new 
ReadRestrictions(restrictionsJson);
+      return restrictions;
+    }
+
+    @Override
+    public Class<Restrictions> getType() {
+      return Restrictions.class;
+    }
+    
+  }
+  
+}

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/Space.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/Space.java?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/Space.java
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/Space.java
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,181 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.manifoldcf.crawler.connectors.confluence.v6.model;
+
+import 
org.apache.manifoldcf.crawler.connectors.confluence.v6.model.builder.ConfluenceResourceBuilder;
+import org.json.simple.JSONObject;
+
+public class Space extends ConfluenceResource {
+
+  protected static final String KEY_LINKS = "_links";
+  protected static final String KEY_ID = "id";
+  protected static final String KEY_SELF = "self";
+  protected static final String KEY_WEBUI = "webui";
+  protected static final String KEY_NAME = "name";
+  protected static final String KEY_KEY = "key";
+  protected static final String KEY_TYPE = "type";
+  protected static final String KEY_EXPANDABLE = "_expandable";
+  protected static final String KEY_METADATA = "metadata";
+  protected static final String KEY_ICON = "icon";
+  protected static final String KEY_DESCRIPTION = "description";
+  protected static final String KEY_HOMEPAGE = "homepage";
+
+  protected String key;
+  protected String name;
+  protected String type;
+  protected String id;
+  protected String webUrl;
+  protected String metadata;
+  protected String icon;
+  protected String description;
+  protected String homepage;
+  protected String url;
+
+  public Space() {
+
+  }
+
+  public String getKey() {
+    return key;
+  }
+
+  public void setKey(final String key) {
+    this.key = key;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(final String name) {
+    this.name = name;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(final String type) {
+    this.type = type;
+  }
+
+  public String getUrl() {
+    return url;
+  }
+
+  public void setUrl(final String url) {
+    this.url = url;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(final String id) {
+    this.id = id;
+  }
+
+  public String getWebUrl() {
+    return webUrl;
+  }
+
+  public void setWebUrl(final String webUrl) {
+    this.webUrl = webUrl;
+  }
+
+  public String getMetadata() {
+    return metadata;
+  }
+
+  public void setMetadata(final String metadata) {
+    this.metadata = metadata;
+  }
+
+  public String getIcon() {
+    return icon;
+  }
+
+  public void setIcon(final String icon) {
+    this.icon = icon;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(final String description) {
+    this.description = description;
+  }
+
+  public String getHomepage() {
+    return homepage;
+  }
+
+  public void setHomepage(final String homepage) {
+    this.homepage = homepage;
+  }
+
+  public static ConfluenceResourceBuilder<? extends Space> builder() {
+    return new SpaceBuilder();
+  }
+
+  public static class SpaceBuilder implements ConfluenceResourceBuilder<Space> 
{
+
+    @Override
+    public Space fromJson(final JSONObject spaceJson) {
+      return fromJson(spaceJson, new Space());
+    }
+
+    @Override
+    public Space fromJson(final JSONObject spaceJson, final Space space) {
+      space.id = spaceJson.get(KEY_ID) == null ? "" : 
spaceJson.get(KEY_ID).toString();
+      space.key = spaceJson.get(KEY_KEY) == null ? "" : 
spaceJson.get(KEY_KEY).toString();
+      space.name = spaceJson.get(KEY_NAME) == null ? "" : 
spaceJson.get(KEY_NAME).toString();
+      space.type = spaceJson.get(KEY_TYPE) == null ? "" : 
spaceJson.get(KEY_TYPE).toString();
+
+      /*
+       * metadata, icon, description & homepage
+       */
+      final JSONObject expandable = (JSONObject) spaceJson.get(KEY_EXPANDABLE);
+      if (expandable != null) {
+        space.metadata = expandable.get(KEY_METADATA) == null ? "" : 
expandable.get(KEY_METADATA).toString();
+        space.icon = expandable.get(KEY_ICON) == null ? "" : 
expandable.get(KEY_ICON).toString();
+        space.description = expandable.get(KEY_DESCRIPTION) == null ? "" : 
expandable.get(KEY_DESCRIPTION).toString();
+        space.homepage = expandable.get(KEY_HOMEPAGE) == null ? "" : 
expandable.get(KEY_HOMEPAGE).toString();
+      }
+
+      /*
+       * Url & WebUrl
+       */
+      final JSONObject links = (JSONObject) spaceJson.get(KEY_LINKS);
+      if (links != null) {
+        space.url = links.get(KEY_SELF) == null ? "" : 
links.get(KEY_SELF).toString();
+        space.webUrl = links.get(KEY_WEBUI) == null ? "" : 
links.get(KEY_WEBUI).toString();
+      }
+
+      return space;
+    }
+
+    @Override
+    public Class<Space> getType() {
+      return Space.class;
+    }
+
+  }
+
+}

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/User.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/User.java?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/User.java
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/User.java
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,79 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.manifoldcf.crawler.connectors.confluence.v6.model;
+
+import 
org.apache.manifoldcf.crawler.connectors.confluence.v6.model.builder.ConfluenceResourceBuilder;
+import org.json.simple.JSONObject;
+
+public class User extends ConfluenceResource {
+
+  protected static final String KEY_USERNAME = "username";
+  protected static final String KEY_USER_KEY = "userKey";
+  protected static final String KEY_DISPLAY_NAME = "displayName";
+  protected static final String KEY_NAME = "name";
+  protected static final String KEY_TYPE = "type";;
+  
+  protected String type;
+  protected String username;
+  protected String userKey;
+  protected String displayName;
+  
+  public String getType() {
+    return type;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public String getUserKey() {
+    return userKey;
+  }
+
+  public String getDisplayName() {
+    return displayName;
+  }
+  
+  public static ConfluenceResourceBuilder<? extends User> builder() {
+    return new UserBuilder();
+  }
+
+  public static class UserBuilder implements ConfluenceResourceBuilder<User>{
+
+    @Override
+    public User fromJson(JSONObject userJson) {
+      return fromJson(userJson, new User());
+    }
+
+    @Override
+    public User fromJson(JSONObject userJson, User user) {
+      user.type = 
(userJson.get(KEY_TYPE)==null)?"":userJson.get(KEY_TYPE).toString();
+      user.username = 
(userJson.get(KEY_USERNAME)==null)?"":userJson.get(KEY_USERNAME).toString();
+      user.userKey = 
(userJson.get(KEY_USER_KEY)==null)?"":userJson.get(KEY_USER_KEY).toString();
+      user.displayName = 
(userJson.get(KEY_DISPLAY_NAME)==null)?"":userJson.get(KEY_DISPLAY_NAME).toString();
+      return user;
+    }
+
+    @Override
+    public Class<User> getType() {
+      return User.class;
+    }
+    
+  }
+  
+}

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/builder/ConfluenceResourceBuilder.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/builder/ConfluenceResourceBuilder.java?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/builder/ConfluenceResourceBuilder.java
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/model/builder/ConfluenceResourceBuilder.java
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,50 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.manifoldcf.crawler.connectors.confluence.v6.model.builder;
+
+import 
org.apache.manifoldcf.crawler.connectors.confluence.v6.model.ConfluenceResource;
+import org.json.simple.JSONObject;
+
+/**
+ * <p>ConfluenceResourceBuilder interface</p>
+ * @author Antonio David Perez Morales &lt;[email protected]&gt;
+ *
+ * @param <T> Subtype of ConfluenceResource to be built
+ */
+public interface ConfluenceResourceBuilder<T extends ConfluenceResource> {
+
+  /**
+   * <p>Creates a T instance from a JSON representation 
+   * @param jsonDocument
+   * @return T instance
+   */
+  T fromJson(JSONObject jsonDocument);
+  
+  /**
+   * <p>Populates the given T instance from a JSON representation and return 
it</p>
+   * @param jsonDocument
+   * @return T instance
+   */
+  T fromJson(JSONObject jsonDocument, T document);
+  
+  /**
+   * <p>Returns the Class of the resource that can be built</p>
+   * @return the type Class of the resource which can be built by this builder
+   */
+  Class<T> getType();
+}

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/util/ConfluenceUtil.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/util/ConfluenceUtil.java?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/util/ConfluenceUtil.java
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/util/ConfluenceUtil.java
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,59 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.manifoldcf.crawler.connectors.confluence.v6.util;
+
+/**
+ * <p>Utility class for Confluence connectors</p>
+ * 
+ * @author Antonio David Perez Morales &lt;[email protected]&gt;
+ *
+ */
+public class ConfluenceUtil {
+
+  private static final String ATTACHMENT_ID_PREFIX = "att";
+  
+  /**
+   * <p>Generates a repository document identifier for the specific attachment 
and page to be used for Repository Documents for attachment pages</p>
+   * @param attachmentId
+   * @param pageId
+   * @return a generated 
+   */
+  public static String generateRepositoryDocumentIdentifier(String 
attachmentId, String pageId) {
+    StringBuilder sb = new StringBuilder();
+    sb.append(attachmentId).append("-").append(pageId);
+    return sb.toString();
+  }
+  
+  /**
+   * <p>Checks if the given id is an attachment or not</p>
+   * @param id
+   * @return a {@code Boolean} indicating if the id is related to an 
attachment or not 
+   */
+  public static Boolean isAttachment(String id) {
+    return id.startsWith(ATTACHMENT_ID_PREFIX);
+  }
+  
+  /**
+   * <p>Gets the attachment id and page id from a repository document id</p>
+   * @param id the repository document id
+   * @return an Array containing the attachment and page ids where index 0 is 
the attachment id and index 1 is the page id
+   */
+  public static String[] getAttachmentAndPageId(String id) {
+    return id.split("-");
+  }
+}

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_en_US.properties?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_en_US.properties
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_en_US.properties
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,43 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ConfluenceAuthorityConnector.Server=Server
+
+ConfluenceAuthorityConnector.ProtocolColon=Protocol:
+ConfluenceAuthorityConnector.HostColon=Host:
+ConfluenceAuthorityConnector.PortColon=Port:
+ConfluenceAuthorityConnector.PathColon=Path:
+ConfluenceAuthorityConnector.SocketTimeoutColon=Socket timeout:
+ConfluenceAuthorityConnector.ConnectionTimeoutColon=Connection timeout:
+ConfluenceAuthorityConnector.UsernameColon=Username:
+ConfluenceAuthorityConnector.PasswordColon=Password:
+
+ConfluenceAuthorityConnector.HostMustNotBeNull=Confluence host must not be null
+ConfluenceAuthorityConnector.HostMustNotIncludeSlash=Confluence host must not 
include a '/' character
+ConfluenceAuthorityConnector.PortMustBeAnInteger=Confluence port must be an 
integer
+ConfluenceAuthorityConnector.SocketTimeoutMustBeAnInteger=Confluence socket 
timeout must be an integer
+ConfluenceAuthorityConnector.ConnectionTimeoutMustBeAnInteger=Confluence 
connection timeout must be an integer
+ConfluenceAuthorityConnector.PathMustNotBeNull=Confluence path must not be null
+ConfluenceAuthorityConnector.PathMustBeginWithASlash=Confluence path must 
begin with a '/' character
+
+ConfluenceAuthorityConnector.Cache=Cache
+ConfluenceAuthorityConnector.CacheLifetime=Cache lifetime:
+ConfluenceAuthorityConnector.minutes=minutes
+ConfluenceAuthorityConnector.CacheLRUSize=Cache LRU size:
+ConfluenceAuthorityConnector.CacheLifetimeCannotBeNull=Cache lifetime cannot 
be null
+ConfluenceAuthorityConnector.CacheLifetimeMustBeAnInteger=Cache lifetime must 
be an integer
+ConfluenceAuthorityConnector.CacheLRUSizeCannotBeNull=Cache LRU size cannot be 
null
+ConfluenceAuthorityConnector.CacheLRUSizeMustBeAnInteger=Cache LRU size must 
be an integer
+

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_es_ES.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_es_ES.properties?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_es_ES.properties
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_es_ES.properties
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ConfluenceAuthorityConnector.Server=Servidor
+
+ConfluenceAuthorityConnector.ProtocolColon=Protocolo:
+ConfluenceAuthorityConnector.HostColon=Host:
+ConfluenceAuthorityConnector.PortColon=Puerto:
+ConfluenceAuthorityConnector.PathColon=Camino:
+ConfluenceAuthorityConnector.SocketTimeoutColon=Socket timeout:
+ConfluenceAuthorityConnector.ConnectionTimeoutColon=Conexión timeout:
+ConfluenceAuthorityConnector.UsernameColon=Nombre de usuario:
+ConfluenceAuthorityConnector.PasswordColon=Contraseña:
+
+ConfluenceAuthorityConnector.HostMustNotBeNull=Confluencia de acogida no debe 
ser nulo
+ConfluenceAuthorityConnector.HostMustNotIncludeSlash=Confluencia de acogida no 
debe incluir una '/' carácter
+ConfluenceAuthorityConnector.PortMustBeAnInteger=Confluencia puerto debe ser 
un entero
+ConfluenceAuthorityConnector.SocketTimeoutMustBeAnInteger=Confluencia socket 
timeout debe ser un entero
+ConfluenceAuthorityConnector.ConnectionTimeoutMustBeAnInteger=Confluencia 
conexión timeout debe ser un entero
+ConfluenceAuthorityConnector.PathMustNotBeNull=Ruta Confluencia no debe ser 
nulo
+ConfluenceAuthorityConnector.PathMustBeginWithASlash=Confluencia ruta debe 
comenzar con una '/' carácter
+
+ConfluenceAuthorityConnector.minutes=minutes
+ConfluenceAuthorityConnector.Cache=Cache
+ConfluenceAuthorityConnector.CacheLifetime=vida útil de la caché:
+ConfluenceAuthorityConnector.CacheLRUSize=Tamaño de caché LRU:
+ConfluenceAuthorityConnector.CacheLifetimeCannotBeNull=Vida útil de la caché 
no puede ser nulo
+ConfluenceAuthorityConnector.CacheLifetimeMustBeAnInteger=Vida útil de la 
caché debe ser un entero
+ConfluenceAuthorityConnector.CacheLRUSizeCannotBeNull=Tamaño de caché LRU no 
puede ser nulo
+ConfluenceAuthorityConnector.CacheLRUSizeMustBeAnInteger=Tamaño de caché LRU 
debe ser un entero

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_fr_FR.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_fr_FR.properties?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_fr_FR.properties
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_fr_FR.properties
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,43 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ConfluenceAuthorityConnector.Server=Serveur
+
+ConfluenceAuthorityConnector.ProtocolColon=Protocole:
+ConfluenceAuthorityConnector.HostColon=Nom d'hôte:
+ConfluenceAuthorityConnector.PortColon=Port:
+ConfluenceAuthorityConnector.PathColon=Chemin:
+ConfluenceAuthorityConnector.SocketTimeoutColon=Socket timeout:
+ConfluenceAuthorityConnector.ConnectionTimeoutColon=Connexion timeout:
+ConfluenceAuthorityConnector.UsernameColon=Nom d'utilisateur:
+ConfluenceAuthorityConnector.PasswordColon=Mot de passe:
+
+ConfluenceAuthorityConnector.HostMustNotBeNull=Le nom d'hôte Confluence ne 
doit pas être vide
+ConfluenceAuthorityConnector.HostMustNotIncludeSlash=Le nom d'hôte Confluence 
ne doit pas contenir un caractère '/'
+ConfluenceAuthorityConnector.PortMustBeAnInteger=Le port Confluence doit être 
un entier
+ConfluenceAuthorityConnector.SocketTimeoutMustBeAnInteger=Confluence socket 
timeout doit être un entier
+ConfluenceAuthorityConnector.ConnectionTimeoutMustBeAnInteger=Confluence 
connexion timeout doit être un entier
+ConfluenceAuthorityConnector.PathMustNotBeNull=Le chemin Confluence ne doit 
pas être vide
+ConfluenceAuthorityConnector.PathMustBeginWithASlash=Le chemin Confluence doit 
commencer par le caractère '/'
+
+
+ConfluenceAuthorityConnector.minutes=minutes
+ConfluenceAuthorityConnector.Cache=Cache
+ConfluenceAuthorityConnector.CacheLifetime=Durée de vie du cache:
+ConfluenceAuthorityConnector.CacheLRUSize=Taille du cache LRU:
+ConfluenceAuthorityConnector.CacheLifetimeCannotBeNull=Une durée de vie de 
cache ne peut être null
+ConfluenceAuthorityConnector.CacheLifetimeMustBeAnInteger=Une durée de vie de 
cache doit être un entier
+ConfluenceAuthorityConnector.CacheLRUSizeCannotBeNull=La taille du cache LRU 
ne peut être null
+ConfluenceAuthorityConnector.CacheLRUSizeMustBeAnInteger=La taille du cache 
LRU doit être un entier

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_ja_JP.properties?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_ja_JP.properties
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_ja_JP.properties
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ConfluenceAuthorityConnector.Server=サーバ
+
+ConfluenceAuthorityConnector.ProtocolColon=プロトコル:
+ConfluenceAuthorityConnector.HostColon=ホスト名:
+ConfluenceAuthorityConnector.PortColon=ポート番号:
+ConfluenceAuthorityConnector.PathColon=パス名:
+ConfluenceAuthorityConnector.SocketTimeoutColon=Socket timeout:
+ConfluenceAuthorityConnector.ConnectionTimeoutColon=Connection timeout:
+ConfluenceAuthorityConnector.UsernameColon=ユーザ名:
+ConfluenceAuthorityConnector.PasswordColon=パスワード:
+
+ConfluenceAuthorityConnector.HostMustNotBeNull=Confluence 
ホスト名が未指定です
+ConfluenceAuthorityConnector.HostMustNotIncludeSlash=Confluence 
ホスト名に文字「/」を含めてはいけません
+ConfluenceAuthorityConnector.PortMustBeAnInteger=Confluence 
ポート番号は数値でなくてはいけません
+ConfluenceAuthorityConnector.SocketTimeoutMustBeAnInteger=Confluence socket 
timeout must be an integer
+ConfluenceAuthorityConnector.ConnectionTimeoutMustBeAnInteger=Confluence 
connection timeout must be an integer
+ConfluenceAuthorityConnector.PathMustNotBeNull=Confluence 
パス名が未指定です
+ConfluenceAuthorityConnector.PathMustBeginWithASlash=Confluence 
パス名は文字「/」で始まらなくてはいけません
+
+ConfluenceAuthorityConnector.minutes=minutes
+ConfluenceAuthorityConnector.Cache=キャッシュ
+ConfluenceAuthorityConnector.CacheLifetime=キャッシュライフタイム:
+ConfluenceAuthorityConnector.CacheLRUSize=キャッシュLRUサイズ:
+ConfluenceAuthorityConnector.CacheLifetimeCannotBeNull=キャッシュライフタイãƒ
 ã‚’入力してください
+ConfluenceAuthorityConnector.CacheLifetimeMustBeAnInteger=キャッシュライフタイãƒ
 ã«ã¯æ•´æ•°ã‚’入力してください
+ConfluenceAuthorityConnector.CacheLRUSizeCannotBeNull=キャッシュLRUサイズをå
…¥åŠ›ã—ã¦ãã ã•ã„
+ConfluenceAuthorityConnector.CacheLRUSizeMustBeAnInteger=キャッシュLRUサイズには整数をå
…¥åŠ›ã—ã¦ãã ã•ã„

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_en_US.properties?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_en_US.properties
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_en_US.properties
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ConfluenceRepositoryConnector.Server=Server
+ConfluenceRepositoryConnector.Spaces=Spaces
+ConfluenceRepositoryConnector.Pages=Pages
+ConfluenceRepositoryConnector.Security=Security
+
+
+ConfluenceRepositoryConnector.ProtocolColon=Protocol:
+ConfluenceRepositoryConnector.HostColon=Host:
+ConfluenceRepositoryConnector.PortColon=Port:
+ConfluenceRepositoryConnector.PathColon=Path:
+ConfluenceRepositoryConnector.SocketTimeoutColon=Socket timeout:
+ConfluenceRepositoryConnector.ConnectionTimeoutColon=Connection timeout:
+ConfluenceRepositoryConnector.UsernameColon=Username:
+ConfluenceRepositoryConnector.PasswordColon=Password:
+
+ConfluenceRepositoryConnector.HostMustNotBeNull=Confluence host must not be 
null
+ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Confluence host must not 
include a '/' character
+ConfluenceRepositoryConnector.PortMustBeAnInteger=Confluence port must be an 
integer
+ConfluenceRepositoryConnector.SocketTimeoutMustBeAnInteger=Confluence socket 
timeout must be an integer
+ConfluenceRepositoryConnector.ConnectionTimeoutMustBeAnInteger=Confluence 
connection timeout must be an integer
+ConfluenceRepositoryConnector.PathMustNotBeNull=Confluence path must not be 
null
+ConfluenceRepositoryConnector.PathMustBeginWithASlash=Confluence path must 
begin with a '/' character
+
+ConfluenceRepositoryConnector.NoSpacesConfigured=No spaces configured. All 
spaces will be crawled
+
+ConfluenceRepositoryConnector.Add=Add
+ConfluenceRepositoryConnector.AddSpace=Add Space
+ConfluenceRepositoryConnector.Delete=Delete
+ConfluenceRepositoryConnector.DeleteSpace=Delete space #
+ConfluenceRepositoryConnector.TypeInASpace=Type in a space
+
+ConfluenceRepositoryConnector.TypeSpec=Type Specification
+ConfluenceRepositoryConnector.TypePage=Page
+ConfluenceRepositoryConnector.TypeBlog=Blog
+ConfluenceRepositoryConnector.ProcessAttachments=Process Attachments
+ConfluenceRepositoryConnector.ActivateSecurity=Activate security

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_es_ES.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_es_ES.properties?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_es_ES.properties
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_es_ES.properties
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ConfluenceRepositoryConnector.Server=Servidor
+ConfluenceRepositoryConnector.Spaces=Espacios
+ConfluenceRepositoryConnector.Pages=Páginas
+ConfluenceRepositoryConnector.Security=Seguridad
+
+
+ConfluenceRepositoryConnector.ProtocolColon=Protocolo:
+ConfluenceRepositoryConnector.HostColon=Host:
+ConfluenceRepositoryConnector.PortColon=Puerto:
+ConfluenceRepositoryConnector.PathColon=Camino:
+ConfluenceRepositoryConnector.SocketTimeoutColon=Socket timeout:
+ConfluenceRepositoryConnector.ConnectionTimeoutColon=Connection timeout:
+ConfluenceRepositoryConnector.UsernameColon=Nombre de usuario:
+ConfluenceRepositoryConnector.PasswordColon=Contraseña:
+
+ConfluenceRepositoryConnector.HostMustNotBeNull=Confluencia de acogida no debe 
ser nulo
+ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Confluencia de acogida 
no debe incluir una '/' carácter
+ConfluenceRepositoryConnector.PortMustBeAnInteger=El puerto de confluencia 
debe ser un número entero
+ConfluenceRepositoryConnector.SocketTimeoutMustBeAnInteger=Confluencia socket 
timeout debe ser un entero
+ConfluenceRepositoryConnector.ConnectionTimeoutMustBeAnInteger=Confluencia 
conexión timeout debe ser un entero
+ConfluenceRepositoryConnector.PathMustNotBeNull=El camino de confluencia no 
debe ser nulo
+ConfluenceRepositoryConnector.PathMustBeginWithASlash=Confluencia ruta debe 
comenzar con una '/' carácter
+
+ConfluenceRepositoryConnector.NoSpacesConfigured=Sin espacios configurados . 
Todos los espacios se rastrearán
+
+ConfluenceRepositoryConnector.Add=añadir
+ConfluenceRepositoryConnector.AddSpace=Añadir Espacio
+ConfluenceRepositoryConnector.Delete=borrar
+ConfluenceRepositoryConnector.DeleteSpace=eliminar el espacio #
+ConfluenceRepositoryConnector.TypeInASpace=Escriba un espacio
+
+ConfluenceRepositoryConnector.TypeSpec=Especificación de tipo
+ConfluenceRepositoryConnector.TypePage=Página
+ConfluenceRepositoryConnector.TypeBlog=Blog
+ConfluenceRepositoryConnector.ProcessAttachments=Accesorios de Proceso
+ConfluenceRepositoryConnector.ActivateSecurity=Activar seguridad

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_fr_FR.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_fr_FR.properties?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_fr_FR.properties
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_fr_FR.properties
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ConfluenceRepositoryConnector.Server=Serveur
+ConfluenceRepositoryConnector.Spaces=Espaces
+ConfluenceRepositoryConnector.Pages=Pages
+ConfluenceRepositoryConnector.Security=Sécurité
+
+
+ConfluenceRepositoryConnector.ProtocolColon=Protocole:
+ConfluenceRepositoryConnector.HostColon=Nom d'hôte:
+ConfluenceRepositoryConnector.PortColon=Port:
+ConfluenceRepositoryConnector.PathColon=Chemin:
+ConfluenceRepositoryConnector.SocketTimeoutColon=Socket timeout:
+ConfluenceRepositoryConnector.ConnectionTimeoutColon=Connexion timeout:
+ConfluenceRepositoryConnector.UsernameColon=Nom d'utilisateur:
+ConfluenceRepositoryConnector.PasswordColon=Mot de passe:
+
+ConfluenceRepositoryConnector.HostMustNotBeNull=Le nom d'hôte Confluence ne 
doit pas être vide
+ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Le nom d'hôte Confluence 
ne doit pas contenir un caractère '/'
+ConfluenceRepositoryConnector.PortMustBeAnInteger=Le port Confluence doit être 
un entier
+ConfluenceRepositoryConnector.SocketTimeoutMustBeAnInteger=Confluence socket 
timeout doit être un entier
+ConfluenceRepositoryConnector.ConnectionTimeoutMustBeAnInteger=Confluence 
connexion timeout doit être un entier
+ConfluenceRepositoryConnector.PathMustNotBeNull=Le chemin Confluence ne doit 
pas être vide
+ConfluenceRepositoryConnector.PathMustBeginWithASlash=Le chemin Confluence 
doit commencer par le caractère '/'
+
+ConfluenceRepositoryConnector.NoSpacesConfigured=Aucun espace configuré. Tous 
les espaces seront moissonnés
+
+ConfluenceRepositoryConnector.Add=Ajouter
+ConfluenceRepositoryConnector.AddSpace=Ajouter Espace
+ConfluenceRepositoryConnector.Delete=Supprimer
+ConfluenceRepositoryConnector.DeleteSpace=Supprimer Espace #
+ConfluenceRepositoryConnector.TypeInASpace=Type dans un espace
+
+ConfluenceRepositoryConnector.TypeSpec=Type Specification
+ConfluenceRepositoryConnector.TypePage=Page
+ConfluenceRepositoryConnector.TypeBlog=Blog
+ConfluenceRepositoryConnector.ProcessAttachments=Traiter les fichiers attachés
+ConfluenceRepositoryConnector.ActivateSecurity=Activer sécurité

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_ja_JP.properties?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_ja_JP.properties
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_ja_JP.properties
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ConfluenceRepositoryConnector.Server=サーバ
+ConfluenceRepositoryConnector.Spaces=スペース
+ConfluenceRepositoryConnector.Pages=ページ
+ConfluenceRepositoryConnector.Security=Security
+
+
+ConfluenceRepositoryConnector.ProtocolColon=プロトコル:
+ConfluenceRepositoryConnector.HostColon=ホスト名:
+ConfluenceRepositoryConnector.PortColon=ポート番号:
+ConfluenceRepositoryConnector.PathColon=パス名:
+ConfluenceRepositoryConnector.SocketTimeoutColon=Socket timeout:
+ConfluenceRepositoryConnector.ConnectionTimeoutColon=Connection timeout:
+ConfluenceRepositoryConnector.UsernameColon=ユーザ名:
+ConfluenceRepositoryConnector.PasswordColon=パスワード:
+
+ConfluenceRepositoryConnector.HostMustNotBeNull=Confluence 
ホスト名が未指定です
+ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Confluence 
ホスト名に文字「/」を含めてはいけません
+ConfluenceRepositoryConnector.PortMustBeAnInteger=Confluence 
ポート番号は数値でなくてはいけません
+ConfluenceRepositoryConnector.SocketTimeoutMustBeAnInteger=Confluence socket 
timeout must be an integer
+ConfluenceRepositoryConnector.ConnectionTimeoutMustBeAnInteger=Confluence 
connection timeout must be an integer
+ConfluenceRepositoryConnector.PathMustNotBeNull=Confluence 
パス名が未指定です
+ConfluenceRepositoryConnector.PathMustBeginWithASlash=Confluence 
パス名は文字「/」で始まらなくてはいけません
+
+ConfluenceRepositoryConnector.NoSpacesConfigured=スペース名が指定されていないのでå
…¨ã‚¹ãƒšãƒ¼ã‚¹ãŒå¯¾è±¡ã¨ãªã‚Šã¾ã™
+
+ConfluenceRepositoryConnector.Add=追加
+ConfluenceRepositoryConnector.AddSpace=スペース追加
+ConfluenceRepositoryConnector.Delete=削除
+ConfluenceRepositoryConnector.DeleteSpace=スペース削除 #
+ConfluenceRepositoryConnector.TypeInASpace=スペース名が空欄です
+
+ConfluenceRepositoryConnector.TypeSpec=ページ型の指定
+ConfluenceRepositoryConnector.TypePage=ページ
+ConfluenceRepositoryConnector.TypeBlog=ブログ
+ConfluenceRepositoryConnector.ProcessAttachments=添付ファイルを含む
+ConfluenceRepositoryConnector.ActivateSecurity=Activate security

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf.js
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf.js?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf.js
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf.js
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,154 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<script type="text/javascript">
+<!--
+function checkConfig()
+{
+  if (editconnection.confluence_port.value == "" || 
!isInteger(editconnection.confluence_port.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PortMustBeAnInteger'))");
+    editconnection.confluence_port.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_socket_timeout.value == "" || 
!isInteger(editconnection.confluence_socket_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.SocketTimeoutMustBeAnInteger'))");
+    editconnection.confluence_socket_timeout.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_connection_timeout.value == "" || 
!isInteger(editconnection.confluence_connection_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ConnectionTimeoutMustBeAnInteger'))");
+    editconnection.confluence_connection_timeout.focus();
+    return false;
+  }
+
+  if (editconnection.confluence_host.value != "" && 
editconnection.confluence_host.value.indexOf("/") != -1)
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.HostMustNotIncludeSlash'))");
+    editconnection.confluence_host.focus();
+    return false;
+  }
+
+  if (editconnection.confluence_path.value != "" && 
!(editconnection.confluence_path.value.indexOf("/") == 0))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PathMustBeginWithASlash'))");
+    editconnection.confluence_path.focus();
+    return false;
+  }
+
+  return true;
+}
+ 
+function checkConfigForSave()
+{
+    
+  if (editconnection.confluence_host.value == "")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.HostMustNotBeNull'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Server'))");
+    editconnection.confluence_host.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_host.value != "" && 
editconnection.confluence_host.value.indexOf("/") != -1)
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.HostMustNotIncludeSlash'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Server'))");
+    editconnection.confluence_host.focus();
+    return false;
+  }
+
+  if (editconnection.confluence_port.value == "" || 
!isInteger(editconnection.confluence_port.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PortMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Server'))");
+    editconnection.confluence_port.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_socket_timeout.value == "" || 
!isInteger(editconnection.confluence_socket_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.SocketTimeoutMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Server'))");
+    editconnection.confluence_socket_timeout.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_connection_timeout.value == "" || 
!isInteger(editconnection.confluence_connection_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ConnectionTimeoutMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Server'))");
+    editconnection.confluence_connection_timeout.focus();
+    return false;
+  }
+
+  if (editconnection.confluence_path.value == "")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PathMustNotBeNull'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Server'))");
+    editconnection.confluence_path.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_path.value != "" && 
!(editconnection.confluence_path.value.indexOf("/") == 0))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PathMustBeginWithASlash'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Server'))");
+    editconnection.confluence_path.focus();
+    return false;
+  }
+  
+  if (editconnection.cache_lifetime.value == "")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.CacheLifetimeCannotBeNull'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Cache'))");
+    editconnection.cache_lifetime.focus();
+    return false;
+  }
+  
+  if (editconnection.cache_lifetime.value != "" && 
!isInteger(editconnection.cache_lifetime.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.CacheLifetimeMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Cache'))");
+    editconnection.cache_lifetime.focus();
+    return false;
+  }
+  
+  if (editconnection.cache_lru_size.value == "")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.CacheLRUSizeCannotBeNull'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Cache'))");
+    editconnection.cache_lru_size.focus();
+    return false;
+  }
+  
+  if (editconnection.cache_lru_size.value != "" && 
!isInteger(editconnection.cache_lru_size.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.CacheLRUSizeMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.Cache'))");
+    editconnection.cache_lru_size.focus();
+    return false;
+  }
+  
+  return true;
+}
+//-->
+</script>

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_cache.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_cache.html?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_cache.html
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_cache.html
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,37 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+#if($TABNAME == 
$ResourceBundle.getString('ConfluenceAuthorityConnector.Cache'))
+
+<table class="displaytable">
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.CacheLifetime'))</nobr></td>
+    <td class="value"><input type="text" size="5" name="cache_lifetime" 
value="$Encoder.attributeEscape($CACHE_LIFETIME)"/> 
$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.minutes'))</td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.CacheLRUSize'))</nobr></td>
+    <td class="value"><input type="text" size="5" name="cache_lru_size" 
value="$Encoder.attributeEscape($CACHE_LRU_SIZE)"/></td>
+  </tr>
+</table>
+
+#else
+
+<input type="hidden" name="cache_lifetime" 
value="$Encoder.attributeEscape($CACHE_LIFETIME)"/>
+<input type="hidden" name="cache_lru_size" 
value="$Encoder.attributeEscape($CACHE_LRU_SIZE)"/>
+
+#end

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_server.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_server.html?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_server.html
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_server.html
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,119 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+#if($TABNAME == 
$ResourceBundle.getString('ConfluenceAuthorityConnector.Server'))
+
+<table class="displaytable">
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProtocolColon'))</nobr>
+    </td>
+    <td class="value">
+      <select size="2" name="confluence_protocol">
+#if($CONFLUENCE_PROTOCOL == 'http')
+        <option value="http" selected="true">http</option>
+#else
+        <option value="http">http</option>
+#end
+#if($CONFLUENCE_PROTOCOL == 'https')
+        <option value="https" selected="true">https</option>
+#else
+        <option value="https">https</option>
+#end
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.HostColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="confluence_host" name="confluence_host" 
value="$Encoder.attributeEscape($CONFLUENCE_HOST)" />
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PortColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="5" type="text" id="confluence_port" name="confluence_port" 
value="$Encoder.attributeEscape($CONFLUENCE_PORT)" />
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PathColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="confluence_path" name="confluence_path" 
value="$Encoder.attributeEscape($CONFLUENCE_PATH)" />
+    </td>
+  </tr>
+  
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.SocketTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="confluence_socket_timeout" 
name="confluence_socket_timeout" 
value="$Encoder.attributeEscape($CONFLUENCE_SOCKET_TIMEOUT)" />
+    </td>
+  </tr>
+  
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ConnectionTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="confluence_connection_timeout" 
name="confluence_connection_timeout" 
value="$Encoder.attributeEscape($CONFLUENCE_CONNECTION_TIMEOUT)" />
+    </td>
+  </tr>
+  
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.UsernameColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="16" type="text" id="confluence_username" 
name="confluence_username" 
value="$Encoder.attributeEscape($CONFLUENCE_USERNAME)" />
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PasswordColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="16" type="password" id="confluence_password" 
name="confluence_password" 
value="$Encoder.attributeEscape($CONFLUENCE_PASSWORD)" />
+    </td>
+  </tr>
+</table>
+
+#else
+
+<input type="hidden" name="confluence_protocol" 
value="$Encoder.attributeEscape($CONFLUENCE_PROTOCOL)" />
+<input type="hidden" name="confluence_host" 
value="$Encoder.attributeEscape($CONFLUENCE_HOST)" />
+<input type="hidden" name="confluence_port" 
value="$Encoder.attributeEscape($CONFLUENCE_PORT)" />
+<input type="hidden" name="confluence_path" 
value="$Encoder.attributeEscape($CONFLUENCE_PATH)" />
+<input type="hidden" name="confluence_username" 
value="$Encoder.attributeEscape($CONFLUENCE_USERNAME)" />
+<input type="hidden" name="confluence_password" 
value="$Encoder.attributeEscape($CONFLUENCE_PASSWORD)" />
+<input type="hidden" name="confluence_socket_timeout" 
value="$Encoder.attributeEscape($CONFLUENCE_SOCKET_TIMEOUT)" />
+<input type="hidden" name="confluence_connection_timeout" 
value="$Encoder.attributeEscape($CONFLUENCE_CONNECTION_TIMEOUT)" />
+
+#end

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/viewConfiguration_conf.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/viewConfiguration_conf.html?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/viewConfiguration_conf.html
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/viewConfiguration_conf.html
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,108 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+<table class="displaytable">
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProtocolColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($CONFLUENCE_PROTOCOL)</nobr>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.HostColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($CONFLUENCE_HOST)</nobr>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PortColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($CONFLUENCE_PORT)</nobr>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PathColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($CONFLUENCE_PATH)</nobr>
+    </td>
+  </tr>
+  
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.SocketTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($CONFLUENCE_SOCKET_TIMEOUT)</nobr>
+    </td>
+  </tr>
+  
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ConnectionTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($CONFLUENCE_CONNECTION_TIMEOUT)</nobr>
+    </td>
+  </tr>
+
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.CacheLifetime'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($CACHE_LIFETIME)</nobr> 
$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.minutes'))</td>
+  </tr>
+  
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.CacheLRUSize'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($CACHE_LRU_SIZE)</nobr></td>
+  </tr>
+
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.UsernameColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($CONFLUENCE_USERNAME)</nobr>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.PasswordColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>********</nobr>
+    </td>
+  </tr>
+
+</table>
+

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf.js
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf.js?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf.js
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf.js
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,122 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<script type="text/javascript">
+<!--
+function checkConfig()
+{
+  if (editconnection.confluence_port.value == "" || 
!isInteger(editconnection.confluence_port.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.PortMustBeAnInteger'))");
+    editconnection.confluence_port.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_socket_timeout.value == "" || 
!isInteger(editconnection.confluence_socket_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.SocketTimeoutMustBeAnInteger'))");
+    editconnection.confluence_socket_timeout.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_connection_timeout.value == "" || 
!isInteger(editconnection.confluence_connection_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ConnectionTimeoutMustBeAnInteger'))");
+    editconnection.confluence_connection_timeout.focus();
+    return false;
+  }
+
+  if (editconnection.confluence_host.value != "" && 
editconnection.confluence_host.value.indexOf("/") != -1)
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.HostMustNotIncludeSlash'))");
+    editconnection.confluence_host.focus();
+    return false;
+  }
+
+//  if (editconnection.confluence_path.value != "" && 
!(editconnection.confluence_path.value.indexOf("/") == 0))
+//  {
+//    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.PathMustBeginWithASlash'))");
+//    editconnection.confluence_path.focus();
+//    return false;
+//  }
+
+  return true;
+}
+ 
+function checkConfigForSave()
+{
+    
+  if (editconnection.confluence_host.value == "")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.HostMustNotBeNull'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.Server'))");
+    editconnection.confluence_host.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_host.value != "" && 
editconnection.confluence_host.value.indexOf("/") != -1)
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.HostMustNotIncludeSlash'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.Server'))");
+    editconnection.confluence_host.focus();
+    return false;
+  }
+
+  if (editconnection.confluence_port.value == "" || 
!isInteger(editconnection.confluence_port.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.PortMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.Server'))");
+    editconnection.confluence_port.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_socket_timeout.value == "" || 
!isInteger(editconnection.confluence_socket_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.SocketTimeoutMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.Server'))");
+    editconnection.confluence_socket_timeout.focus();
+    return false;
+  }
+  
+  if (editconnection.confluence_connection_timeout.value == "" || 
!isInteger(editconnection.confluence_connection_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ConnectionTimeoutMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.Server'))");
+    editconnection.confluence_connection_timeout.focus();
+    return false;
+  }
+
+//  if (editconnection.confluence_path.value == "")
+//  {
+//    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.PathMustNotBeNull'))");
+//    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.Server'))");
+//    editconnection.confluence_path.focus();
+//    return false;
+//  }
+//  
+//  if (editconnection.confluence_path.value != "" && 
!(editconnection.confluence_path.value.indexOf("/") == 0))
+//  {
+//    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.PathMustBeginWithASlash'))");
+//    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.Server'))");
+//    editconnection.confluence_path.focus();
+//    return false;
+//  }
+  
+  return true;
+}
+//-->
+</script>

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf_server.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf_server.html?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf_server.html
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf_server.html
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,119 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+#if($TABNAME == 
$ResourceBundle.getString('ConfluenceRepositoryConnector.Server'))
+
+<table class="displaytable">
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProtocolColon'))</nobr>
+    </td>
+    <td class="value">
+      <select size="2" name="confluence_protocol">
+#if($CONFLUENCE_PROTOCOL == 'http')
+        <option value="http" selected="true">http</option>
+#else
+        <option value="http">http</option>
+#end
+#if($CONFLUENCE_PROTOCOL == 'https')
+        <option value="https" selected="true">https</option>
+#else
+        <option value="https">https</option>
+#end
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.HostColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="confluence_host" name="confluence_host" 
value="$Encoder.attributeEscape($CONFLUENCE_HOST)" />
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.PortColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="5" type="text" id="confluence_port" name="confluence_port" 
value="$Encoder.attributeEscape($CONFLUENCE_PORT)" />
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.PathColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="confluence_path" name="confluence_path" 
value="$Encoder.attributeEscape($CONFLUENCE_PATH)" />
+    </td>
+  </tr>
+  
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.SocketTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="confluence_socket_timeout" 
name="confluence_socket_timeout" 
value="$Encoder.attributeEscape($CONFLUENCE_SOCKET_TIMEOUT)" />
+    </td>
+  </tr>
+  
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ConnectionTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="confluence_connection_timeout" 
name="confluence_connection_timeout" 
value="$Encoder.attributeEscape($CONFLUENCE_CONNECTION_TIMEOUT)" />
+    </td>
+  </tr>
+  
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.UsernameColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="16" type="text" id="confluence_username" 
name="confluence_username" 
value="$Encoder.attributeEscape($CONFLUENCE_USERNAME)" />
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.PasswordColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="16" type="password" id="confluence_password" 
name="confluence_password" 
value="$Encoder.attributeEscape($CONFLUENCE_PASSWORD)" />
+    </td>
+  </tr>
+</table>
+
+#else
+
+<input type="hidden" name="confluence_protocol" 
value="$Encoder.attributeEscape($CONFLUENCE_PROTOCOL)" />
+<input type="hidden" name="confluence_host" 
value="$Encoder.attributeEscape($CONFLUENCE_HOST)" />
+<input type="hidden" name="confluence_port" 
value="$Encoder.attributeEscape($CONFLUENCE_PORT)" />
+<input type="hidden" name="confluence_path" 
value="$Encoder.attributeEscape($CONFLUENCE_PATH)" />
+<input type="hidden" name="confluence_username" 
value="$Encoder.attributeEscape($CONFLUENCE_USERNAME)" />
+<input type="hidden" name="confluence_password" 
value="$Encoder.attributeEscape($CONFLUENCE_PASSWORD)" />
+<input type="hidden" name="confluence_socket_timeout" 
value="$Encoder.attributeEscape($CONFLUENCE_SOCKET_TIMEOUT)" />
+<input type="hidden" name="confluence_connection_timeout" 
value="$Encoder.attributeEscape($CONFLUENCE_CONNECTION_TIMEOUT)" />
+
+#end

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editSpecification_conf.js
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editSpecification_conf.js?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editSpecification_conf.js
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editSpecification_conf.js
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,49 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<script type="text/javascript">
+<!--
+function checkSpecificationForSave()
+{
+  return true;
+}
+ 
+function s${SeqNum}_SpecOp(n, opValue, anchorvalue)
+{
+  eval("editjob."+n+".value = \""+opValue+"\"");
+  postFormSetAnchor(anchorvalue);
+}
+
+function s${SeqNum}_SpecDeleteSpace(i)
+{
+       s${SeqNum}_SpecOp("s${SeqNum}_spaceop_"+i,"Delete","space_"+i);
+}
+
+function s${SeqNum}_SpecAddSpace(i)
+{
+  var x = i-1;
+  if (editjob["s${SeqNum}_space"].value == "")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.TypeInASpace'))");
+    editjob.s${SeqNum}_space.focus();
+    return;
+  }
+  s${SeqNum}_SpecOp("s${SeqNum}_spaceop","Add","space_"+i);
+}
+
+//-->
+</script>
\ No newline at end of file

Added: 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editSpecification_confPages.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editSpecification_confPages.html?rev=1874903&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editSpecification_confPages.html
 (added)
+++ 
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editSpecification_confPages.html
 Fri Mar  6 15:29:45 2020
@@ -0,0 +1,58 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+#if($TabName == 
$ResourceBundle.getString('ConfluenceRepositoryConnector.Pages') && ${SeqNum} 
== ${SelectedNum})
+
+<table class="displaytable">
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  
+  <tr>
+    <td class="description" colspan="2">
+        
$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProcessAttachments'))
+    </td>
+    <td class="value">
+      <input type="checkbox" name="s${SeqNum}_process_attachments" value="true"
+      #if($PROCESS_ATTACHMENTS == 'true') checked
+      #end 
+      />
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description" colspan="2">
+        
$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.TypeSpec'))
+    </td>
+    <td class="value">
+      <input type="radio" name="s${SeqNum}_pagetype" value="page"
+      #if($PAGETYPE == 'page') checked
+      #end
+      
><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.TypePage'))</nobr></input>
+      <input type="radio" name="s${SeqNum}_pagetype" value="blogpost"
+      #if($PAGETYPE == 'blogpost') checked
+      #end
+      
><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.TypeBlog'))</nobr></input>
+    </td>
+  </tr>
+</table>
+
+#else
+
+<input type="hidden" name="s${SeqNum}_process_attachments" 
value="$PROCESS_ATTACHMENTS"/>
+<input type="hidden" name="s${SeqNum}_pagetype" value="$PAGETYPE"/>
+
+#end


Reply via email to