Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp Fri Jun 12 
22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * 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.
- */
+* 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.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,31 +28,23 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"index.ApacheManifoldCF")%>
-  </title>
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+       <title>
+               
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.ApacheManifoldCF")%>
+       </title>
 
 </head>
 
 <body class="standardbody">
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "index.WelcomeToApacheManifoldFC")%>
-      </p>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" 
flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" 
flush="true"/></td>
+       <td class="window">
+       <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.WelcomeToApacheManifoldFC")%></p>
+       </td>
+      </tr>
+    </table>
 
 </body>
 

Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listauthorities.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listauthorities.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listauthorities.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listauthorities.jsp 
Fri Jun 12 22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * 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.
- */
+* 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.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,139 +28,114 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listauthorities.ApacheManifoldCFListAuthorities")%>
-  </title>
-
-  <script type="text/javascript">
-    <!--
-
-    function Delete(connectionName) {
-      if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listauthorities.DeleteAuthority")%>
 '" + connectionName + "'?")) {
-        document.listconnections.op.value = "Delete";
-        document.listconnections.connname.value = connectionName;
-        document.listconnections.submit();
-      }
-    }
+       <title>
+               
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.ApacheManifoldCFListAuthorities")%>
+       </title>
+
+       <script type="text/javascript">
+       <!--
+
+       function Delete(connectionName)
+       {
+               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listauthorities.DeleteAuthority")%>
 '"+connectionName+"'?"))
+               {
+                       document.listconnections.op.value="Delete";
+                       document.listconnections.connname.value=connectionName;
+                       document.listconnections.submit();
+               }
+       }
 
-    //-->
-  </script>
+       //-->
+       </script>
 
 </head>
 
 <body class="standardbody">
 
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listauthorities.ListOfAuthorityConnections")%>
-      </p>
-
-      <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="authority"/>
-        <input type="hidden" name="connname" value=""/>
-
-        <%
-          try {
-            // Get the authority connection manager handle
-            IAuthorityConnectionManager manager = 
AuthorityConnectionManagerFactory.make(threadContext);
-            IAuthorityConnectorManager connectorManager = 
AuthorityConnectorManagerFactory.make(threadContext);
-            IAuthorityConnection[] connections = manager.getAllConnections();
-        %>
-        <table class="datatable">
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr class="headerrow">
-            <td class="columnheader"></td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listauthorities.Name")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listauthorities.Description")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listauthorities.AuthorityType")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listauthorities.Max")%>
-            </td>
-          </tr>
-          <%
-            int i = 0;
-            while (i < connections.length) {
-              IAuthorityConnection connection = connections[i++];
-
-              String name = connection.getName();
-              String description = connection.getDescription();
-              if (description == null)
-                description = "";
-              String className = connection.getClassName();
-              int maxCount = connection.getMaxConnections();
-              String connectorName = 
connectorManager.getDescription(className);
-              if (connectorName == null)
-                connectorName = className + "(uninstalled)";
-
-          %>
-          <tr <%="class=\"" + ((i % 2 == 0) ? "evendatarow" : "odddatarow") + 
"\""%>>
-            <td class="columncell">
-              <nobr>
-                <a 
href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 alt='<%="View 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listauthorities.View")%>
-                </a>
-                <a 
href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listauthorities.Edit")%>
-                </a>
-                <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listauthorities.Delete")%>
-                </a>
-              </nobr>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%>
-            </td>
-            <td class="columncell"><%=Integer.toString(maxCount)%>
-            </td>
-          </tr>
-          <%
-            }
-          %>
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="message" colspan="5">
-              <a href="editauthority.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.AddNewConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listauthorities.AddaNewConnection")%>
-              </a></td>
-          </tr>
-        </table>
-
-        <%
-        } catch (ManifoldCFException e) {
-          e.printStackTrace();
-          variableContext.setParameter("text", e.getMessage());
-          variableContext.setParameter("target", "index.jsp");
-        %>
-        <jsp:forward page="error.jsp"/>
-        <%
-          }
-        %>
-      </form>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" 
flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" 
flush="true"/></td>
+       <td class="window">
+       <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.ListOfAuthorityConnections")%></p>
+       <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
+               <input type="hidden" name="op" value="Continue"/>
+               <input type="hidden" name="type" value="authority"/>
+               <input type="hidden" name="connname" value=""/>
+
+<%
+    try
+    {
+       // Get the authority connection manager handle
+       IAuthorityConnectionManager manager = 
AuthorityConnectionManagerFactory.make(threadContext);
+       IAuthorityConnectorManager connectorManager = 
AuthorityConnectorManagerFactory.make(threadContext);
+       IAuthorityConnection[] connections = manager.getAllConnections();
+%>
+               <table class="datatable">
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+                       <tr class="headerrow">
+                               <td class="columnheader"></td><td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Name")%></td><td
 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Description")%></td><td
 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AuthorityType")%></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Max")%></td>
+                       </tr>
+<%
+       int i = 0;
+       while (i < connections.length)
+       {
+               IAuthorityConnection connection = connections[i++];
+
+               String name = connection.getName();
+               String description = connection.getDescription();
+               if (description == null)
+                       description = "";
+               String className = connection.getClassName();
+               int maxCount = connection.getMaxConnections();
+               String connectorName = 
connectorManager.getDescription(className);
+               if (connectorName == null)
+                       connectorName = className + "(uninstalled)";
+
+%>
+               <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+                       <td class="columncell">
+                               <nobr>
+                                       <a 
href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 alt='<%="View 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.View")%></a>
+                                       <a 
href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Edit")%></a>
+                                       <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Delete")%></a>
+                               </nobr>
+                       </td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+                       <td 
class="columncell"><%=Integer.toString(maxCount)%></td>
+               </tr>
+<%
+       }
+%>
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+                       <tr><td class="message" colspan="5"><a 
href="editauthority.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.AddNewConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AddaNewConnection")%></a></td></tr>
+               </table>
+
+<%
+    }
+    catch (ManifoldCFException e)
+    {
+       e.printStackTrace();
+       variableContext.setParameter("text",e.getMessage());
+       variableContext.setParameter("target","index.jsp");
+%>
+       <jsp:forward page="error.jsp"/>
+<%
+    }
+%>
+           </form>
+       </td>
+      </tr>
+    </table>
 
 </body>
 

Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp 
Fri Jun 12 22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * 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.
- */
+* 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.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,143 +28,119 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listconnections.ApacheManifoldCFListConnections")%>
-  </title>
-
-  <script type="text/javascript">
-    <!--
-
-    function Delete(connectionName) {
-      if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listconnections.DeleteConnection")%>
 '" + connectionName + "'?")) {
-        document.listconnections.op.value = "Delete";
-        document.listconnections.connname.value = connectionName;
-        document.listconnections.submit();
-      }
-    }
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+       <title>
+               
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.ApacheManifoldCFListConnections")%>
+       </title>
+
+       <script type="text/javascript">
+       <!--
+
+       function Delete(connectionName)
+       {
+               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listconnections.DeleteConnection")%>
 '"+connectionName+"'?"))
+               {
+                       document.listconnections.op.value="Delete";
+                       document.listconnections.connname.value=connectionName;
+                       document.listconnections.submit();
+               }
+       }
 
-    //-->
-  </script>
+       //-->
+       </script>
 
 </head>
 
 <body class="standardbody">
 
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.ListOfRepositoryConnections")%>
-      </p>
-
-      <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="connection"/>
-        <input type="hidden" name="connname" value=""/>
-
-        <%
-          try {
-            // Get the job manager handle
-            IRepositoryConnectionManager manager = 
RepositoryConnectionManagerFactory.make(threadContext);
-            IConnectorManager connectorManager = 
ConnectorManagerFactory.make(threadContext);
-            IRepositoryConnection[] connections = manager.getAllConnections();
-        %>
-        <table class="datatable">
-          <tr>
-            <td class="separator" colspan="6">
-              <hr/>
-            </td>
-          </tr>
-          <tr class="headerrow">
-            <td class="columnheader"></td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.Name")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.Description")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.ConnectionType")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.AuthorityGroup")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.Max")%>
-            </td>
-          </tr>
-          <%
-            int i = 0;
-            while (i < connections.length) {
-              IRepositoryConnection connection = connections[i++];
-
-              String name = connection.getName();
-              String description = connection.getDescription();
-              if (description == null)
-                description = "";
-              String className = connection.getClassName();
-              String connectorName = 
connectorManager.getDescription(className);
-              if (connectorName == null)
-                connectorName = className + 
Messages.getString(pageContext.getRequest().getLocale(), 
"listconnections.uninstalled");
-              String authorityName = connection.getACLAuthority();
-              int maxCount = connection.getMaxConnections();
-
-          %>
-          <tr <%="class=\"" + ((i % 2 == 0) ? "evendatarow" : "odddatarow") + 
"\""%>>
-            <td class="columncell">
-              <nobr>
-                <a 
href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.View")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.View")%>
-                </a>
-                <a 
href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.Edit")%>
-                </a>
-                <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.Delete")%>
-                </a>
-              </nobr>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%>
-            </td>
-            <td class="columncell"><%=((authorityName == null) ? 
Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listconnections.GlobalAuthority") : 
org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName))%>
-            </td>
-            <td class="columncell"><%=Integer.toString(maxCount)%>
-            </td>
-          </tr>
-          <%
-            }
-          %>
-          <tr>
-            <td class="separator" colspan="6">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="message" colspan="6">
-              <a href="editconnection.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.AddAConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listconnections.AddNewConnection")%>
-              </a></td>
-          </tr>
-        </table>
-
-        <%
-        } catch (ManifoldCFException e) {
-          e.printStackTrace();
-          variableContext.setParameter("text", e.getMessage());
-          variableContext.setParameter("target", "index.jsp");
-        %>
-        <jsp:forward page="error.jsp"/>
-        <%
-          }
-        %>
-      </form>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" 
flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" 
flush="true"/></td>
+       <td class="window">
+       <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.ListOfRepositoryConnections")%></p>
+       <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
+               <input type="hidden" name="op" value="Continue"/>
+               <input type="hidden" name="type" value="connection"/>
+               <input type="hidden" name="connname" value=""/>
+
+<%
+    try
+    {
+       // Get the job manager handle
+       IRepositoryConnectionManager manager = 
RepositoryConnectionManagerFactory.make(threadContext);
+       IConnectorManager connectorManager = 
ConnectorManagerFactory.make(threadContext);
+       IRepositoryConnection[] connections = manager.getAllConnections();
+%>
+               <table class="datatable">
+                       <tr>
+                               <td class="separator" colspan="6"><hr/></td>
+                       </tr>
+                       <tr class="headerrow">
+                               <td class="columnheader"></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Name")%></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Description")%></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.ConnectionType")%></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.AuthorityGroup")%></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Max")%></td>
+                       </tr>
+<%
+       int i = 0;
+       while (i < connections.length)
+       {
+               IRepositoryConnection connection = connections[i++];
+
+               String name = connection.getName();
+               String description = connection.getDescription();
+               if (description == null)
+                       description = "";
+               String className = connection.getClassName();
+               String connectorName = 
connectorManager.getDescription(className);
+               if (connectorName == null)
+                       connectorName = className + 
Messages.getString(pageContext.getRequest().getLocale(),"listconnections.uninstalled");
+               String authorityName = connection.getACLAuthority();
+               int maxCount = connection.getMaxConnections();
+
+%>
+               <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+                       <td class="columncell">
+                               <nobr>
+                                       <a 
href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.View")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.View")%></a>
+                                       <a 
href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Edit")%></a>
+                                       <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Delete")%></a>
+                               </nobr>
+                       </td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+                       <td 
class="columncell"><%=((authorityName==null)?Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.GlobalAuthority"):org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName))%></td>
+                       <td 
class="columncell"><%=Integer.toString(maxCount)%></td>
+               </tr>
+<%
+       }
+%>
+                       <tr>
+                               <td class="separator" colspan="6"><hr/></td>
+                       </tr>
+                       <tr><td class="message" colspan="6"><a 
href="editconnection.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.AddAConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.AddNewConnection")%></a></td></tr>
+               </table>
+
+<%
+    }
+    catch (ManifoldCFException e)
+    {
+       e.printStackTrace();
+       variableContext.setParameter("text",e.getMessage());
+       variableContext.setParameter("target","index.jsp");
+%>
+       <jsp:forward page="error.jsp"/>
+<%
+    }
+%>
+           </form>
+       </td>
+      </tr>
+    </table>
 
 </body>
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listgroups.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listgroups.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listgroups.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listgroups.jsp Fri 
Jun 12 22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * 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.
- */
+* 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.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,125 +28,107 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listgroups.ApacheManifoldCFListAuthorityGroups")%>
-  </title>
-
-  <script type="text/javascript">
-    <!--
-
-    function Delete(groupName) {
-      if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listgroups.DeleteAuthorityGroup")%>
 '" + groupName + "'?")) {
-        document.listgroups.op.value = "Delete";
-        document.listgroups.groupname.value = groupName;
-        document.listgroups.submit();
-      }
-    }
+       <title>
+               
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.ApacheManifoldCFListAuthorityGroups")%>
+       </title>
+
+       <script type="text/javascript">
+       <!--
+
+       function Delete(groupName)
+       {
+               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listgroups.DeleteAuthorityGroup")%>
 '"+groupName+"'?"))
+               {
+                       document.listgroups.op.value="Delete";
+                       document.listgroups.groupname.value=groupName;
+                       document.listgroups.submit();
+               }
+       }
 
-    //-->
-  </script>
+       //-->
+       </script>
 
 </head>
 
 <body class="standardbody">
 
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listgroups.ListOfAuthorityGroups")%>
-      </p>
-
-      <form class="standardform" name="listgroups" action="execute.jsp" 
method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="group"/>
-        <input type="hidden" name="groupname" value=""/>
-
-        <%
-          try {
-            // Get the authority group manager handle
-            IAuthorityGroupManager manager = 
AuthorityGroupManagerFactory.make(threadContext);
-            IAuthorityGroup[] groups = manager.getAllGroups();
-        %>
-        <table class="datatable">
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr class="headerrow">
-            <td class="columnheader"></td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listgroups.Name")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listgroups.Description")%>
-            </td>
-          </tr>
-          <%
-            int i = 0;
-            while (i < groups.length) {
-              IAuthorityGroup group = groups[i++];
-
-              String name = group.getName();
-              String description = group.getDescription();
-              if (description == null)
-                description = "";
-
-          %>
-          <tr <%="class=\"" + ((i % 2 == 0) ? "evendatarow" : "odddatarow") + 
"\""%>>
-            <td class="columncell">
-              <nobr>
-                <a 
href='<%="viewgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.View")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listgroups.View")%>
-                </a>
-                <a 
href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listgroups.Edit")%>
-                </a>
-                <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listgroups.Delete")%>
-                </a>
-              </nobr>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
-            </td>
-          </tr>
-          <%
-            }
-          %>
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="message" colspan="5">
-              <a href="editgroup.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.AddNewGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listgroups.AddaNewGroup")%>
-              </a></td>
-          </tr>
-        </table>
-
-        <%
-        } catch (ManifoldCFException e) {
-          e.printStackTrace();
-          variableContext.setParameter("text", e.getMessage());
-          variableContext.setParameter("target", "index.jsp");
-        %>
-        <jsp:forward page="error.jsp"/>
-        <%
-          }
-        %>
-      </form>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" 
flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" 
flush="true"/></td>
+       <td class="window">
+       <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.ListOfAuthorityGroups")%></p>
+       <form class="standardform" name="listgroups" action="execute.jsp" 
method="POST">
+               <input type="hidden" name="op" value="Continue"/>
+               <input type="hidden" name="type" value="group"/>
+               <input type="hidden" name="groupname" value=""/>
+
+<%
+    try
+    {
+       // Get the authority group manager handle
+       IAuthorityGroupManager manager = 
AuthorityGroupManagerFactory.make(threadContext);
+       IAuthorityGroup[] groups = manager.getAllGroups();
+%>
+               <table class="datatable">
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+                       <tr class="headerrow">
+                               <td class="columnheader"></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Name")%></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Description")%></td>
+                       </tr>
+<%
+       int i = 0;
+       while (i < groups.length)
+       {
+               IAuthorityGroup group = groups[i++];
+
+               String name = group.getName();
+               String description = group.getDescription();
+               if (description == null)
+                       description = "";
+
+%>
+               <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+                       <td class="columncell">
+                               <nobr>
+                                       <a 
href='<%="viewgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.View")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.View")%></a>
+                                       <a 
href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Edit")%></a>
+                                       <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Delete")%></a>
+                               </nobr>
+                       </td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+               </tr>
+<%
+       }
+%>
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+                       <tr><td class="message" colspan="5"><a 
href="editgroup.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.AddNewGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.AddaNewGroup")%></a></td></tr>
+               </table>
+
+<%
+    }
+    catch (ManifoldCFException e)
+    {
+       e.printStackTrace();
+       variableContext.setParameter("text",e.getMessage());
+       variableContext.setParameter("target","index.jsp");
+%>
+       <jsp:forward page="error.jsp"/>
+<%
+    }
+%>
+           </form>
+       </td>
+      </tr>
+    </table>
 
 </body>
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp Fri Jun 
12 22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * 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.
- */
+* 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.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,158 +28,130 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.ApacheManifoldCFListJobDescriptions")%>
-  </title>
-
-  <script type="text/javascript">
-    <!--
-
-    function Delete(jobID) {
-      if (confirm("Warning: Deleting this job will remove all\nassociated 
documents from the index.\nDo you want to proceed?")) {
-        document.listjobs.op.value = "Delete";
-        document.listjobs.jobid.value = jobID;
-        document.listjobs.submit();
-      }
-    }
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+       <title>
+               
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.ApacheManifoldCFListJobDescriptions")%>
+       </title>
+
+       <script type="text/javascript">
+       <!--
+
+       function Delete(jobID)
+       {
+               if (confirm("Warning: Deleting this job will remove 
all\nassociated documents from the index.\nDo you want to proceed?"))
+               {
+                       document.listjobs.op.value="Delete";
+                       document.listjobs.jobid.value=jobID;
+                       document.listjobs.submit();
+               }
+       }
 
-    //-->
-  </script>
+       //-->
+       </script>
 
 
 </head>
 
 <body class="standardbody">
 
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listjobs.JobList")%>
-      </p>
-
-      <form class="standardform" name="listjobs" action="execute.jsp" 
method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="job"/>
-        <input type="hidden" name="jobid" value=""/>
-
-        <%
-          try {
-            // Get the job manager handle
-            IJobManager manager = JobManagerFactory.make(threadContext);
-            IJobDescription[] jobs = manager.getAllJobs();
-        %>
-        <table class="datatable">
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr class="headerrow">
-            <td class="columnheader"></td>
-            <td class="columnheader">
-              
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.Name")%>
-              </nobr>
-            </td>
-            <td class="columnheader">
-              
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.OutputConnection")%>
-              </nobr>
-            </td>
-            <td class="columnheader">
-              
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.RepositoryConnection")%>
-              </nobr>
-            </td>
-            <td class="columnheader">
-              
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.ScheduleType")%>
-              </nobr>
-            </td>
-          </tr>
-          <%
-            for (int i = 0; i < jobs.length; i++) {
-              IJobDescription jd = jobs[i];
-
-              StringBuilder sb = new StringBuilder();
-              for (int j = 0; j < jd.countPipelineStages(); j++) {
-                if (jd.getPipelineStageIsOutputConnection(j)) {
-                  if (sb.length() > 0)
-                    sb.append(",");
-                  sb.append(jd.getPipelineStageConnectionName(j));
-                }
-              }
-              String outputConnectionNames = sb.toString();
-
-              String jobType = "";
-              switch (jd.getType()) {
-                case IJobDescription.TYPE_CONTINUOUS:
-                  jobType = "Continuous crawl";
-                  break;
-                case IJobDescription.TYPE_SPECIFIED:
-                  jobType = "Specified time";
-                  break;
-                default:
-              }
-
-          %>
-          <tr <%="class=\"" + ((i % 2 == 0) ? "evendatarow" : "odddatarow") + 
"\""%>>
-            <td class="columncell">
-              <nobr>
-                <a href='<%="viewjob.jsp?jobid="+jd.getID()%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Viewjob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.View")%>
-                </a>
-                <a href='<%="editjob.jsp?jobid="+jd.getID()%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Editjob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.Edit")%>
-                </a>
-                <a href='<%="javascript:Delete(\""+jd.getID()+"\")"%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.DeleteJob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.Delete")%>
-                </a>
-                <a href='<%="editjob.jsp?origjobid="+jd.getID()%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.CopyJob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.Copy")%>
-                </a>
-              </nobr>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getDescription())%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(outputConnectionNames)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getConnectionName())%>
-            </td>
-            <td class="columncell"><%=jobType%>
-            </td>
-          </tr>
-          <%
-            }
-          %>
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="message" colspan="5">
-              <a href="editjob.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Addajob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listjobs.AddaNewJob")%>
-              </a></td>
-          </tr>
-        </table>
-
-        <%
-        } catch (ManifoldCFException e) {
-          e.printStackTrace();
-          variableContext.setParameter("text", e.getMessage());
-          variableContext.setParameter("target", "index.jsp");
-        %>
-        <jsp:forward page="error.jsp"/>
-        <%
-          }
-        %>
-      </form>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" 
flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" 
flush="true"/></td>
+       <td class="window">
+       <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.JobList")%></p>
+       <form class="standardform" name="listjobs" action="execute.jsp" 
method="POST">
+               <input type="hidden" name="op" value="Continue"/>
+               <input type="hidden" name="type" value="job"/>
+               <input type="hidden" name="jobid" value=""/>
+
+<%
+    try
+    {
+       // Get the job manager handle
+       IJobManager manager = JobManagerFactory.make(threadContext);
+       IJobDescription[] jobs = manager.getAllJobs();
+%>
+               <table class="datatable">
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+                       <tr class="headerrow">
+                               <td class="columnheader"></td>
+                               <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Name")%></nobr></td>
+                               <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.OutputConnection")%></nobr></td>
+                               <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.RepositoryConnection")%></nobr></td>
+                               <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.ScheduleType")%></nobr></td>
+                       </tr>
+<%
+       for (int i = 0; i < jobs.length; i++)
+       {
+               IJobDescription jd = jobs[i];
+
+               StringBuilder sb = new StringBuilder();
+               for (int j = 0; j < jd.countPipelineStages(); j++)
+               {
+                       if (jd.getPipelineStageIsOutputConnection(j))
+                       {
+                               if (sb.length() > 0)
+                                       sb.append(",");
+                               sb.append(jd.getPipelineStageConnectionName(j));
+                       }
+               }
+               String outputConnectionNames = sb.toString();
+               
+               String jobType = "";
+               switch (jd.getType())
+               {
+               case IJobDescription.TYPE_CONTINUOUS:
+                       jobType = "Continuous crawl";
+                       break;
+               case IJobDescription.TYPE_SPECIFIED:
+                       jobType = "Specified time";
+                       break;
+               default:
+               }
+
+%>
+               <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+                   <td class="columncell">
+                       <nobr>
+                               <a href='<%="viewjob.jsp?jobid="+jd.getID()%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Viewjob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.View")%></a>
+                               <a href='<%="editjob.jsp?jobid="+jd.getID()%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Editjob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Edit")%></a>
+                               <a 
href='<%="javascript:Delete(\""+jd.getID()+"\")"%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.DeleteJob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Delete")%></a>
+                               <a 
href='<%="editjob.jsp?origjobid="+jd.getID()%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.CopyJob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Copy")%></a>
+                       </nobr>
+                   </td>
+                   <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getDescription())%></td>
+                   <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(outputConnectionNames)%></td>
+                   <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getConnectionName())%></td>
+                   <td class="columncell"><%=jobType%></td>
+               </tr>
+<%
+       }
+%>
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+               <tr><td class="message" colspan="5"><a href="editjob.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Addajob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.AddaNewJob")%></a></td></tr>
+               </table>
+
+<%
+    }
+    catch (ManifoldCFException e)
+    {
+       e.printStackTrace();
+       variableContext.setParameter("text",e.getMessage());
+       variableContext.setParameter("target","index.jsp");
+%>
+       <jsp:forward page="error.jsp"/>
+<%
+    }
+%>
+           </form>
+       </td>
+      </tr>
+    </table>
 
 </body>
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listmappers.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listmappers.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listmappers.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listmappers.jsp Fri 
Jun 12 22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * 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.
- */
+* 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.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,139 +28,117 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listmappers.ApacheManifoldCFListMappers")%>
-  </title>
-
-  <script type="text/javascript">
-    <!--
-
-    function Delete(connectionName) {
-      if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listmappers.DeleteMapper")%>
 '" + connectionName + "'?")) {
-        document.listconnections.op.value = "Delete";
-        document.listconnections.connname.value = connectionName;
-        document.listconnections.submit();
-      }
-    }
+       <title>
+               
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.ApacheManifoldCFListMappers")%>
+       </title>
+
+       <script type="text/javascript">
+       <!--
+
+       function Delete(connectionName)
+       {
+               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listmappers.DeleteMapper")%>
 '"+connectionName+"'?"))
+               {
+                       document.listconnections.op.value="Delete";
+                       document.listconnections.connname.value=connectionName;
+                       document.listconnections.submit();
+               }
+       }
 
-    //-->
-  </script>
+       //-->
+       </script>
 
 </head>
 
 <body class="standardbody">
 
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listmappers.ListOfMappingConnections")%>
-      </p>
-
-      <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="mapper"/>
-        <input type="hidden" name="connname" value=""/>
-
-        <%
-          try {
-            // Get the mapping connection manager handle
-            IMappingConnectionManager manager = 
MappingConnectionManagerFactory.make(threadContext);
-            IMappingConnectorManager connectorManager = 
MappingConnectorManagerFactory.make(threadContext);
-            IMappingConnection[] connections = manager.getAllConnections();
-        %>
-        <table class="datatable">
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr class="headerrow">
-            <td class="columnheader"></td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listmappers.Name")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listmappers.Description")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listmappers.MapperType")%>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listmappers.Max")%>
-            </td>
-          </tr>
-          <%
-            int i = 0;
-            while (i < connections.length) {
-              IMappingConnection connection = connections[i++];
-
-              String name = connection.getName();
-              String description = connection.getDescription();
-              if (description == null)
-                description = "";
-              String className = connection.getClassName();
-              int maxCount = connection.getMaxConnections();
-              String connectorName = 
connectorManager.getDescription(className);
-              if (connectorName == null)
-                connectorName = className + 
Messages.getString(pageContext.getRequest().getLocale(), 
"listmappers.uninstalled");
-
-          %>
-          <tr <%="class=\"" + ((i % 2 == 0) ? "evendatarow" : "odddatarow") + 
"\""%>>
-            <td class="columncell">
-              <nobr>
-                <a 
href='<%="viewmapper.jsp?connname="+URLEncoder.encode(name)%>' alt='<%="View 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listmappers.View")%>
-                </a>
-                <a 
href='<%="editmapper.jsp?connname="+URLEncoder.encode(name)%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listmappers.Edit")%>
-                </a>
-                <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listmappers.Delete")%>
-                </a>
-              </nobr>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%>
-            </td>
-            <td class="columncell"><%=Integer.toString(maxCount)%>
-            </td>
-          </tr>
-          <%
-            }
-          %>
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="message" colspan="5">
-              <a href="editmapper.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.AddNewConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listmappers.AddaNewConnection")%>
-              </a></td>
-          </tr>
-        </table>
-
-        <%
-        } catch (ManifoldCFException e) {
-          e.printStackTrace();
-          variableContext.setParameter("text", e.getMessage());
-          variableContext.setParameter("target", "index.jsp");
-        %>
-        <jsp:forward page="error.jsp"/>
-        <%
-          }
-        %>
-      </form>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" 
flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" 
flush="true"/></td>
+       <td class="window">
+       <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.ListOfMappingConnections")%></p>
+       <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
+               <input type="hidden" name="op" value="Continue"/>
+               <input type="hidden" name="type" value="mapper"/>
+               <input type="hidden" name="connname" value=""/>
+
+<%
+    try
+    {
+       // Get the mapping connection manager handle
+       IMappingConnectionManager manager = 
MappingConnectionManagerFactory.make(threadContext);
+       IMappingConnectorManager connectorManager = 
MappingConnectorManagerFactory.make(threadContext);
+       IMappingConnection[] connections = manager.getAllConnections();
+%>
+               <table class="datatable">
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+                       <tr class="headerrow">
+                               <td class="columnheader"></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Name")%></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Description")%></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.MapperType")%></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Max")%></td>
+                       </tr>
+<%
+       int i = 0;
+       while (i < connections.length)
+       {
+               IMappingConnection connection = connections[i++];
+
+               String name = connection.getName();
+               String description = connection.getDescription();
+               if (description == null)
+                       description = "";
+               String className = connection.getClassName();
+               int maxCount = connection.getMaxConnections();
+               String connectorName = 
connectorManager.getDescription(className);
+               if (connectorName == null)
+                       connectorName = className + 
Messages.getString(pageContext.getRequest().getLocale(),"listmappers.uninstalled");
+
+%>
+               <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+                       <td class="columncell">
+                               <nobr>
+                                       <a 
href='<%="viewmapper.jsp?connname="+URLEncoder.encode(name)%>' alt='<%="View 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.View")%></a>
+                                       <a 
href='<%="editmapper.jsp?connname="+URLEncoder.encode(name)%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Edit")%></a>
+                                       <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Delete")%></a>
+                               </nobr>
+                       </td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+                       <td 
class="columncell"><%=Integer.toString(maxCount)%></td>
+               </tr>
+<%
+       }
+%>
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+                       <tr><td class="message" colspan="5"><a 
href="editmapper.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.AddNewConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.AddaNewConnection")%></a></td></tr>
+               </table>
+
+<%
+    }
+    catch (ManifoldCFException e)
+    {
+       e.printStackTrace();
+       variableContext.setParameter("text",e.getMessage());
+       variableContext.setParameter("target","index.jsp");
+%>
+       <jsp:forward page="error.jsp"/>
+<%
+    }
+%>
+           </form>
+       </td>
+      </tr>
+    </table>
 
 </body>
 

Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp 
Fri Jun 12 22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * 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.
- */
+* 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.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,145 +28,116 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listnotifications.ApacheManifoldCFListNotificationConnections")%>
-  </title>
-
-  <script type="text/javascript">
-    <!--
-
-    function Delete(connectionName) {
-      if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listnotifications.DeleteNotificationConnection")%>
 '" + connectionName + "'?")) {
-        document.listconnections.op.value = "Delete";
-        document.listconnections.connname.value = connectionName;
-        document.listconnections.submit();
-      }
-    }
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+       <title>
+               
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ApacheManifoldCFListNotificationConnections")%>
+       </title>
+
+       <script type="text/javascript">
+       <!--
+
+       function Delete(connectionName)
+       {
+               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listnotifications.DeleteNotificationConnection")%>
 '"+connectionName+"'?"))
+               {
+                       document.listconnections.op.value="Delete";
+                       document.listconnections.connname.value=connectionName;
+                       document.listconnections.submit();
+               }
+       }
 
-    //-->
-  </script>
+       //-->
+       </script>
 
 </head>
 
 <body class="standardbody">
 
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listnotifications.ListOfNotificationConnections")%>
-      </p>
-
-      <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="transformation"/>
-        <input type="hidden" name="connname" value=""/>
-
-        <%
-          try {
-            // Get the notification connection manager handle
-            INotificationConnectionManager manager = 
NotificationConnectionManagerFactory.make(threadContext);
-            INotificationConnectorManager connectorManager = 
NotificationConnectorManagerFactory.make(threadContext);
-            INotificationConnection[] connections = 
manager.getAllConnections();
-        %>
-        <table class="datatable">
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr class="headerrow">
-            <td class="columnheader"></td>
-            <td class="columnheader">
-              
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listnotifications.Name")%>
-              </nobr>
-            </td>
-            <td class="columnheader">
-              
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listnotifications.Description")%>
-              </nobr>
-            </td>
-            <td class="columnheader">
-              
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listnotifications.ConnectionType")%>
-              </nobr>
-            </td>
-            <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listnotifications.Max")%>
-            </td>
-          </tr>
-          <%
-            int i = 0;
-            while (i < connections.length) {
-              INotificationConnection connection = connections[i++];
-
-              String name = connection.getName();
-              String description = connection.getDescription();
-              if (description == null)
-                description = "";
-              String className = connection.getClassName();
-              String connectorName = 
connectorManager.getDescription(className);
-              if (connectorName == null)
-                connectorName = className + 
Messages.getString(pageContext.getRequest().getLocale(), 
"listnotifications.uninstalled");
-              ;
-              int maxCount = connection.getMaxConnections();
-
-          %>
-          <tr <%="class=\"" + ((i % 2 == 0) ? "evendatarow" : "odddatarow") + 
"\""%>>
-            <td class="columncell">
-              <nobr>
-                <a 
href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.View")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listnotifications.View")%>
-                </a>
-                <a 
href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listnotifications.Edit")%>
-                </a>
-                <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listnotifications.Delete")%>
-                </a>
-              </nobr>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
-            </td>
-            <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%>
-            </td>
-            <td class="columncell"><%=Integer.toString(maxCount)%>
-            </td>
-          </tr>
-          <%
-            }
-          %>
-          <tr>
-            <td class="separator" colspan="5">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="message" colspan="5">
-              <a href="editnotification.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
 "listnotifications.AddaNewNotificationConnection")%>
-              </a></td>
-          </tr>
-        </table>
-
-        <%
-        } catch (ManifoldCFException e) {
-          e.printStackTrace();
-          variableContext.setParameter("text", e.getMessage());
-          variableContext.setParameter("target", "index.jsp");
-        %>
-        <jsp:forward page="error.jsp"/>
-        <%
-          }
-        %>
-      </form>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" 
flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" 
flush="true"/></td>
+       <td class="window">
+       <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ListOfNotificationConnections")%></p>
+       <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
+               <input type="hidden" name="op" value="Continue"/>
+               <input type="hidden" name="type" value="transformation"/>
+               <input type="hidden" name="connname" value=""/>
+
+<%
+    try
+    {
+       // Get the notification connection manager handle
+       INotificationConnectionManager manager = 
NotificationConnectionManagerFactory.make(threadContext);
+       INotificationConnectorManager connectorManager = 
NotificationConnectorManagerFactory.make(threadContext);
+       INotificationConnection[] connections = manager.getAllConnections();
+%>
+               <table class="datatable">
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+                       <tr class="headerrow">
+                               <td class="columnheader"></td>
+                               <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Name")%></nobr></td>
+                               <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Description")%></nobr></td>
+                               <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ConnectionType")%></nobr></td>
+                               <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Max")%></td>
+                       </tr>
+<%
+       int i = 0;
+       while (i < connections.length)
+       {
+               INotificationConnection connection = connections[i++];
+
+               String name = connection.getName();
+               String description = connection.getDescription();
+               if (description == null)
+                       description = "";
+               String className = connection.getClassName();
+               String connectorName = 
connectorManager.getDescription(className);
+               if (connectorName == null)
+                       connectorName = className + 
Messages.getString(pageContext.getRequest().getLocale(),"listnotifications.uninstalled");;
+               int maxCount = connection.getMaxConnections();
+
+%>
+               <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+                       <td class="columncell">
+                               <nobr>
+                                       <a 
href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.View")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.View")%></a>
+                                       <a 
href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Edit")%></a>
+                                       <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Delete")%></a>
+                               </nobr>
+                       </td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+                       <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+                       <td 
class="columncell"><%=Integer.toString(maxCount)%></td>
+               </tr>
+<%
+       }
+%>
+                       <tr>
+                               <td class="separator" colspan="5"><hr/></td>
+                       </tr>
+                       <tr><td class="message" colspan="5"><a 
href="editnotification.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.AddaNewNotificationConnection")%></a></td></tr>
+               </table>
+
+<%
+    }
+    catch (ManifoldCFException e)
+    {
+       e.printStackTrace();
+       variableContext.setParameter("text",e.getMessage());
+       variableContext.setParameter("target","index.jsp");
+%>
+       <jsp:forward page="error.jsp"/>
+<%
+    }
+%>
+           </form>
+       </td>
+      </tr>
+    </table>
 
 </body>
 


Reply via email to