manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1522731 - in /manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main: java/org/apache/manifoldcf/crawler/connectors/jira/ native2ascii/org/apache/manifoldcf/crawler/connectors/jira/ resources/org/apache/manifoldcf/crawler/co...
Date Thu, 12 Sep 2013 21:15:30 GMT
Author: kwright
Date: Thu Sep 12 21:15:29 2013
New Revision: 1522731

URL: http://svn.apache.org/r1522731
Log:
Add UI changes to repository connector.

Added:
    manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira.js
      - copied, changed from r1521804, manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js
    manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_proxy.html
  (with props)
Removed:
    manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js
Modified:
    manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraConfig.java
    manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
    manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_en_US.properties
    manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_ja_JP.properties
    manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/viewConfiguration_jira.html

Modified: manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraConfig.java?rev=1522731&r1=1522730&r2=1522731&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraConfig.java
(original)
+++ manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraConfig.java
Thu Sep 12 21:15:29 2013
@@ -32,6 +32,12 @@ public class JiraConfig {
   public static final String JIRA_PORT_PARAM = "jiraport";
   public static final String JIRA_PATH_PARAM = "jirapath";
   
+  public static final String JIRA_PROXYHOST_PARAM = "jiraproxyhost";
+  public static final String JIRA_PROXYPORT_PARAM = "jiraproxyport";
+  public static final String JIRA_PROXYDOMAIN_PARAM = "jiraproxydomain";
+  public static final String JIRA_PROXYUSERNAME_PARAM = "jiraproxyusername";
+  public static final String JIRA_PROXYPASSWORD_PARAM = "jiraproxypassword";
+
   public static final String JIRA_QUERY_PARAM = "jiraquery";
   
   public static final String CLIENT_ID_DEFAULT = "";
@@ -41,6 +47,12 @@ public class JiraConfig {
   public static final String JIRA_PORT_DEFAULT = "";
   public static final String JIRA_PATH_DEFAULT = "/rest/api/2/";
   
+  public static final String JIRA_PROXYHOST_DEFAULT = "";
+  public static final String JIRA_PROXYPORT_DEFAULT = "";
+  public static final String JIRA_PROXYDOMAIN_DEFAULT = "";
+  public static final String JIRA_PROXYUSERNAME_DEFAULT = "";
+  public static final String JIRA_PROXYPASSWORD_DEFAULT = "";
+
   public static final String JIRA_QUERY_DEFAULT = "ORDER BY createdDate Asc";
 
     

Modified: manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java?rev=1522731&r1=1522730&r2=1522731&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
(original)
+++ manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
Thu Sep 12 21:15:29 2013
@@ -72,7 +72,8 @@ public class JiraRepositoryConnector ext
 
   // Configuration tabs
   private static final String JIRA_SERVER_TAB_PROPERTY = "JiraRepositoryConnector.Server";
-  
+  private static final String JIRA_PROXY_TAB_PROPERTY = "JiraAuthorityConnector.Proxy";
+
   // Specification tabs
   private static final String JIRA_QUERY_TAB_PROPERTY = "JiraRepositoryConnector.JiraQuery";
   private static final String JIRA_SECURITY_TAB_PROPERTY = "JiraRepositoryConnector.Security";
@@ -81,12 +82,16 @@ public class JiraRepositoryConnector ext
   /**
    * Forward to the javascript to check the configuration parameters
    */
-  private static final String EDIT_CONFIG_HEADER_FORWARD = "editConfiguration_jira_server.js";
+  private static final String EDIT_CONFIG_HEADER_FORWARD = "editConfiguration_jira.js";
   /**
    * Server tab template
    */
   private static final String EDIT_CONFIG_FORWARD_SERVER = "editConfiguration_jira_server.html";
-  
+  /**
+   * Proxy tab template
+   */
+  private static final String EDIT_CONFIG_FORWARD_PROXY = "editConfiguration_jira_proxy.html";
+
   /**
    * Forward to the HTML template to view the configuration parameters
    */
@@ -348,6 +353,41 @@ public class JiraRepositoryConnector ext
   }
 
   /**
+   * Fill in a Proxy tab configuration parameter map for calling a Velocity
+   * template.
+   *
+   * @param newMap is the map to fill in
+   * @param parameters is the current set of configuration parameters
+   */
+  private static void fillInProxyConfigurationMap(Map<String, Object> newMap, IPasswordMapperActivity
mapper, ConfigParams parameters) {
+    String jiraproxyhost = parameters.getParameter(JiraConfig.JIRA_PROXYHOST_PARAM);
+    String jiraproxyport = parameters.getParameter(JiraConfig.JIRA_PROXYPORT_PARAM);
+    String jiraproxydomain = parameters.getParameter(JiraConfig.JIRA_PROXYDOMAIN_PARAM);
+    String jiraproxyusername = parameters.getParameter(JiraConfig.JIRA_PROXYUSERNAME_PARAM);
+    String jiraproxypassword = parameters.getObfuscatedParameter(JiraConfig.JIRA_PROXYPASSWORD_PARAM);
+
+    if (jiraproxyhost == null)
+      jiraproxyhost = JiraConfig.JIRA_PROXYHOST_DEFAULT;
+    if (jiraproxyport == null)
+      jiraproxyport = JiraConfig.JIRA_PROXYPORT_DEFAULT;
+
+    if (jiraproxydomain == null)
+      jiraproxydomain = JiraConfig.JIRA_PROXYDOMAIN_DEFAULT;
+    if (jiraproxyusername == null)
+      jiraproxyusername = JiraConfig.JIRA_PROXYUSERNAME_DEFAULT;
+    if (jiraproxypassword == null)
+      jiraproxypassword = JiraConfig.JIRA_PROXYPASSWORD_DEFAULT;
+    else
+      jiraproxypassword = mapper.mapPasswordToKey(jiraproxypassword);
+
+    newMap.put("JIRAPROXYHOST", jiraproxyhost);
+    newMap.put("JIRAPROXYPORT", jiraproxyport);
+    newMap.put("JIRAPROXYDOMAIN", jiraproxydomain);
+    newMap.put("JIRAPROXYUSERNAME", jiraproxyusername);
+    newMap.put("JIRAPROXYPASSWORD", jiraproxypassword);
+  }
+
+  /**
    * View configuration. This method is called in the body section of the
    * connector's view configuration page. Its purpose is to present the
    * connection information to the user. The coder can presume that the HTML
@@ -366,6 +406,7 @@ public class JiraRepositoryConnector ext
 
     // Fill in map from each tab
     fillInServerConfigurationMap(paramMap, out, parameters);
+    fillInProxyConfigurationMap(paramMap, out, parameters);
 
     Messages.outputResourceWithVelocity(out,locale,VIEW_CONFIG_FORWARD,paramMap);
   }
@@ -390,11 +431,14 @@ public class JiraRepositoryConnector ext
       throws ManifoldCFException, IOException {
     // Add the Server tab
     tabsArray.add(Messages.getString(locale, JIRA_SERVER_TAB_PROPERTY));
+    // Add the Proxy tab
+    tabsArray.add(Messages.getString(locale, JIRA_PROXY_TAB_PROPERTY));
     // Map the parameters
     Map<String, Object> paramMap = new HashMap<String, Object>();
 
     // Fill in the parameters from each tab
     fillInServerConfigurationMap(paramMap, out, parameters);
+    fillInProxyConfigurationMap(paramMap, out, parameters);
 
     // Output the Javascript - only one Velocity template for all tabs
     Messages.outputResourceWithVelocity(out,locale,EDIT_CONFIG_HEADER_FORWARD,paramMap);
@@ -411,10 +455,15 @@ public class JiraRepositoryConnector ext
     // Set the tab name
     paramMap.put("TabName", tabName);
 
-    // Server tab
     // Fill in the parameters
     fillInServerConfigurationMap(paramMap, out, parameters);
+    fillInProxyConfigurationMap(paramMap, out, parameters);
+
+    // Server tab
     Messages.outputResourceWithVelocity(out,locale,EDIT_CONFIG_FORWARD_SERVER,paramMap);
+    // Proxy tab
+    Messages.outputResourceWithVelocity(out,locale,EDIT_CONFIG_FORWARD_PROXY,paramMap);
+
   }
 
   /**
@@ -439,6 +488,8 @@ public class JiraRepositoryConnector ext
     IPostParameters variableContext, ConfigParams parameters)
     throws ManifoldCFException {
 
+    // Server tab parameters
+
     String jiraprotocol = variableContext.getParameter("jiraprotocol");
     if (jiraprotocol != null)
       parameters.setParameter(JiraConfig.JIRA_PROTOCOL_PARAM, jiraprotocol);
@@ -463,6 +514,28 @@ public class JiraRepositoryConnector ext
     if (clientsecret != null)
       parameters.setObfuscatedParameter(JiraConfig.CLIENT_SECRET_PARAM, variableContext.mapKeyToPassword(clientsecret));
 
+    // Proxy tab parameters
+    
+    String jiraproxyhost = variableContext.getParameter("jiraproxyhost");
+    if (jiraproxyhost != null)
+      parameters.setParameter(JiraConfig.JIRA_PROXYHOST_PARAM, jiraproxyhost);
+
+    String jiraproxyport = variableContext.getParameter("jiraproxyport");
+    if (jiraproxyport != null)
+      parameters.setParameter(JiraConfig.JIRA_PROXYPORT_PARAM, jiraproxyport);
+    
+    String jiraproxydomain = variableContext.getParameter("jiraproxydomain");
+    if (jiraproxydomain != null)
+      parameters.setParameter(JiraConfig.JIRA_PROXYDOMAIN_PARAM, jiraproxydomain);
+
+    String jiraproxyusername = variableContext.getParameter("jiraproxyusername");
+    if (jiraproxyusername != null)
+      parameters.setParameter(JiraConfig.JIRA_PROXYUSERNAME_PARAM, jiraproxyusername);
+
+    String jiraproxypassword = variableContext.getParameter("jiraproxypassword");
+    if (jiraproxypassword != null)
+      parameters.setObfuscatedParameter(JiraConfig.JIRA_PROXYPASSWORD_PARAM, variableContext.mapKeyToPassword(jiraproxypassword));
+
     return null;
   }
 

Modified: manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_en_US.properties?rev=1522731&r1=1522730&r2=1522731&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_en_US.properties
(original)
+++ manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_en_US.properties
Thu Sep 12 21:15:29 2013
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 JiraRepositoryConnector.Server=Server
+JiraRepositoryConnector.Proxy=Proxy
 JiraRepositoryConnector.JiraQuery=Seed Query
 JiraRepositoryConnector.Security=Security
 
@@ -23,12 +24,22 @@ JiraRepositoryConnector.JiraPortColon=JI
 JiraRepositoryConnector.JiraRESTAPIPathColon=JIRA REST API path:
 JiraRepositoryConnector.ClientIDColon=Client ID (Optional):
 JiraRepositoryConnector.ClientSecretColon=Client Secret (Optional):
+
+JiraRepositoryConnector.JiraProxyHostColon=Proxy host:
+JiraRepositoryConnector.JiraProxyPortColon=Proxy port:
+JiraRepositoryConnector.JiraProxyDomainColon=Proxy authentication domain:
+JiraRepositoryConnector.JiraProxyUsernameColon=Proxy authentication user name:
+JiraRepositoryConnector.JiraProxyPasswordColon=Proxy authentication password:
+
 JiraRepositoryConnector.JiraHostMustNotBeNull=JIRA host must not be null
 JiraRepositoryConnector.JiraHostMustNotIncludeSlash=JIRA host must not include a '/' character
 JiraRepositoryConnector.JiraPortMustBeAnInteger=JIRA port must be an integer
 JiraRepositoryConnector.JiraPathMustNotBeNull=JIRA path must not be null
 JiraRepositoryConnector.JiraPathMustBeginWithASlash=JIRA path must begin with a '/' character
 
+JiraRepositoryConnector.JiraProxyPortMustBeAnInteger=Proxy port must be an integer
+JiraRepositoryConnector.JiraProxyHostMustNotIncludeSlash=Proxy host cannot include a '/'
character
+
 JiraRepositoryConnector.JiraQueryColon=JIRA query:
 JiraRepositoryConnector.SeedQueryCannotBeNull=Seed query cannot be null
 

Modified: manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_ja_JP.properties?rev=1522731&r1=1522730&r2=1522731&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_ja_JP.properties
(original)
+++ manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jira/common_ja_JP.properties
Thu Sep 12 21:15:29 2013
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 JiraRepositoryConnector.Server=Server
+JiraRepositoryConnector.Proxy=Proxy
 JiraRepositoryConnector.JiraQuery=Seed Query
 JiraRepositoryConnector.Security=Security
 
@@ -23,12 +24,22 @@ JiraRepositoryConnector.JiraPortColon=JI
 JiraRepositoryConnector.JiraRESTAPIPathColon=JIRA REST API path:
 JiraRepositoryConnector.ClientIDColon=Client ID (Optional):
 JiraRepositoryConnector.ClientSecretColon=Client Secret (Optional):
+
+JiraRepositoryConnector.JiraProxyHostColon=Proxy host:
+JiraRepositoryConnector.JiraProxyPortColon=Proxy port:
+JiraRepositoryConnector.JiraProxyDomainColon=Proxy authentication domain:
+JiraRepositoryConnector.JiraProxyUsernameColon=Proxy authentication user name:
+JiraRepositoryConnector.JiraProxyPasswordColon=Proxy authentication password:
+
 JiraRepositoryConnector.JiraHostMustNotBeNull=JIRA host must not be null
 JiraRepositoryConnector.JiraHostMustNotIncludeSlash=JIRA host must not include a '/' character
 JiraRepositoryConnector.JiraPortMustBeAnInteger=JIRA port must be an integer
 JiraRepositoryConnector.JiraPathMustNotBeNull=JIRA path must not be null
 JiraRepositoryConnector.JiraPathMustBeginWithASlash=JIRA path must begin with a '/' character
 
+JiraRepositoryConnector.JiraProxyPortMustBeAnInteger=Proxy port must be an integer
+JiraRepositoryConnector.JiraProxyHostMustNotIncludeSlash=Proxy host cannot include a '/'
character
+
 JiraRepositoryConnector.JiraQueryColon=JIRA query:
 JiraRepositoryConnector.SeedQueryCannotBeNull=Seed query cannot be null
 

Copied: manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira.js
(from r1521804, manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js)
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira.js?p2=manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira.js&p1=manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js&r1=1521804&r2=1522731&rev=1522731&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js
(original)
+++ manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira.js
Thu Sep 12 21:15:29 2013
@@ -40,6 +40,20 @@ function checkConfig()
     return false;
   }
 
+  if (editconnection.jiraproxyport.value != "" && !isInteger(editconnection.jiraproxyport.value))
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyPortMustBeAnInteger'))");
+    editconnection.jiraproxyport.focus();
+    return false;
+  }
+
+  if (editconnection.jiraproxyhost.value != "" && editconnection.jiraproxyhost.value.indexOf("/")
!= -1)
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyHostMustNotIncludeSlash'))");
+    editconnection.jiraproxyhost.focus();
+    return false;
+  }
+
   return true;
 }
  
@@ -85,6 +99,22 @@ function checkConfigForSave()
     editconnection.jirapath.focus();
     return false;
   }
+  
+  if (editconnection.jiraproxyhost.value != "" && editconnection.jiraproxyhost.value.indexOf("/")
!= -1)
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyHostMustNotIncludeSlash'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraRepositoryConnector.Proxy'))");
+    editconnection.jirahost.focus();
+    return false;
+  }
+
+  if (editconnection.jiraproxyport.value != "" && !isInteger(editconnection.jiraproxyport.value))
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyPortMustBeAnInteger'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraRepositoryConnector.Proxy'))");
+    editconnection.jiraport.focus();
+    return false;
+  }
 
   return true;
 }

Added: manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_proxy.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_proxy.html?rev=1522731&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_proxy.html
(added)
+++ manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_proxy.html
Thu Sep 12 21:15:29 2013
@@ -0,0 +1,78 @@
+<!--
+ 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('JiraRepositoryConnector.Proxy'))
+
+<table class="displaytable">
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyHostColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="jiraproxyhost" name="jiraproxyhost" value="$Encoder.attributeEscape($JIRAPROXYHOST)"
/>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyPortColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="5" type="text" id="jiraproxyport" name="jiraproxyport" value="$Encoder.attributeEscape($JIRAPROXYPORT)"
/>
+    </td>
+  </tr>
+
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyDomainColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="jiraproxydomain" name="jiraproxydomain" value="$Encoder.attributeEscape($JIRAPROXYDOMAIN)"
/>
+    </td>
+  </tr>
+  
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyUsernameColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="16" type="text" id="jiraproxyusername" name="jiraproxyusername" value="$Encoder.attributeEscape($JIRAPROXYUSERNAME)"
/>
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyPasswordColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="16" type="password" id="jiraproxypassword" name="jiraproxypassword"
value="$Encoder.attributeEscape($JIRAPROXYPASSWORD)" />
+    </td>
+  </tr>
+</table>
+
+#else
+
+<input type="hidden" name="jiraproxyhost" value="$Encoder.attributeEscape($JIRAPROXYHOST)"
/>
+<input type="hidden" name="jiraproxyport" value="$Encoder.attributeEscape($JIRAPROXYPORT)"
/>
+<input type="hidden" name="jiraproxydomain" value="$Encoder.attributeEscape($JIRAPROXYDOMAIN)"
/>
+<input type="hidden" name="jiraproxyusername" value="$Encoder.attributeEscape($JIRAPROXYUSERNAME)"
/>
+<input type="hidden" name="jiraproxypassword" value="$Encoder.attributeEscape($JIRAPROXYPASSWORD)"
/>
+
+#end

Propchange: manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_proxy.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_proxy.html
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/viewConfiguration_jira.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/viewConfiguration_jira.html?rev=1522731&r1=1522730&r2=1522731&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/viewConfiguration_jira.html
(original)
+++ manifoldcf/branches/CONNECTORS-773/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/viewConfiguration_jira.html
Thu Sep 12 21:15:29 2013
@@ -63,6 +63,7 @@
       <nobr>$Encoder.bodyEscape($CLIENTID)</nobr>
     </td>
   </tr>
+
   <tr>
     <td class="description">
       <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.ClientSecretColon'))</nobr>
@@ -71,5 +72,55 @@
       <nobr>********</nobr>
     </td>
   </tr>
+  
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyHostColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($JIRAPROXYHOST)</nobr>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyPortColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($JIRAPROXYPORT)</nobr>
+    </td>
+  </tr>
+
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyDomainColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($JIRAPROXYDOMAIN)</nobr>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyUsernameColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($JIRAPROXYUSERNAME)</nobr>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraProxyPasswordColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>********</nobr>
+    </td>
+  </tr>
+
 </table>
 



Mime
View raw message