Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3306A18386 for ; Tue, 9 Jun 2015 01:30:39 +0000 (UTC) Received: (qmail 65614 invoked by uid 500); 9 Jun 2015 01:30:39 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 65478 invoked by uid 500); 9 Jun 2015 01:30:39 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 65264 invoked by uid 99); 9 Jun 2015 01:30:38 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2015 01:30:38 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 90809AC0711 for ; Tue, 9 Jun 2015 01:30:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1684303 [6/18] - in /manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp: ./ css/ javascript/ less/ Date: Tue, 09 Jun 2015 01:30:37 -0000 To: commits@manifoldcf.apache.org From: kishore@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150609013038.90809AC0711@hades.apache.org> Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1684303&r1=1684302&r2=1684303&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp Tue Jun 9 01:30:36 2015 @@ -2,480 +2,420 @@ <% -/* $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. + */ %> <% - // The contract of this edit page is as follows. It is either called directly, in which case it is expected to be creating - // a connection or beginning the process of editing an existing connection, or it is called via redirection from execute.jsp, in which case - // the connection object being edited will be placed in the thread context under the name "ConnectionObject". - try - { - // Get the connection manager handle - IOutputConnectionManager connMgr = OutputConnectionManagerFactory.make(threadContext); - // Also get the list of available connectors - IOutputConnectorManager connectorManager = OutputConnectorManagerFactory.make(threadContext); - - // Figure out what the current tab name is. - String tabName = variableContext.getParameter("tabname"); - if (tabName == null || tabName.length() == 0) - tabName = Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name"); - String connectionName = null; - IOutputConnection connection = (IOutputConnection)threadContext.get("ConnectionObject"); - if (connection == null) - { - // We did not go through execute.jsp - // We might have received an argument specifying the connection name. - connectionName = variableContext.getParameter("connname"); - // If the connectionname is not null, load the connection description and prepopulate everything with what comes from it. - if (connectionName != null && connectionName.length() > 0) - { - connection = connMgr.load(connectionName); - } - } - - // Set up default fields. - boolean isNew = true; - String description = ""; - String className = ""; - int maxConnections = 10; - ConfigParams parameters = new ConfigParams(); - - // If there's a connection object, set up all our parameters from it. - if (connection != null) - { - // Set up values - isNew = connection.getIsNew(); - connectionName = connection.getName(); - description = connection.getDescription(); - className = connection.getClassName(); - parameters = connection.getConfigParams(); - maxConnections = connection.getMaxConnections(); - } - else - connectionName = null; - - if (connectionName == null) - connectionName = ""; - - // Initialize tabs array. - ArrayList tabsArray = new ArrayList(); - - // Set up the predefined tabs - tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name")); - tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type")); - if (className.length() > 0) - tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Throttling")); - -%> - - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.ApacheManifoldCFEditOutputConnection")%> - - - -<% - OutputConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); -%> - - - - - - - - -
-<% - // Get connector list; need this to decide what to do - IResultSet set = connectorManager.getConnectors(); - if (set.getRowCount() == 0) - { -%> -

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditOutputConnection")%>

-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NoOutputConnectorsRegistered")%>
-<% - } - else - { -%> - -
- - - - - - - - - - - - - -<% - int tabNum = 0; - while (tabNum < tabsArray.size()) - { - String tab = (String)tabsArray.get(tabNum++); - if (tab.equals(tabName)) - { -%> - -<% - } - else - { -%> - -<% - } - } -%> - - -
-<% - if (description.length() > 0) - { -%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditOutputConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>' -<% - } - else - { -%> - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditAnOutputConnection")%> -<% - } -%> -
<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%>
-<% - - - // Name tab - if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name"))) - { -%> - - - - - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NameColon")%> -<% - // If the connection doesn't exist yet, we are allowed to change the name. - if (connection == null || connectionName.length() < 1) - { -%> - -<% - } - else - { -%> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - -<% - } -%> -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.DescriptionColon")%> - -
-<% - } - else - { - // Hiddens for the Name tab -%> - - -<% - } + // The contract of this edit page is as follows. It is either called directly, in which case it is expected to be creating + // a connection or beginning the process of editing an existing connection, or it is called via redirection from execute.jsp, in which case + // the connection object being edited will be placed in the thread context under the name "ConnectionObject". + try { + // Get the connection manager handle + IOutputConnectionManager connMgr = OutputConnectionManagerFactory.make(threadContext); + // Also get the list of available connectors + IOutputConnectorManager connectorManager = OutputConnectorManagerFactory.make(threadContext); + + // Figure out what the current tab name is. + String tabName = variableContext.getParameter("tabname"); + if (tabName == null || tabName.length() == 0) + tabName = Messages.getString(pageContext.getRequest().getLocale(), "editoutput.Name"); + String connectionName = null; + IOutputConnection connection = (IOutputConnection) threadContext.get("ConnectionObject"); + if (connection == null) { + // We did not go through execute.jsp + // We might have received an argument specifying the connection name. + connectionName = variableContext.getParameter("connname"); + // If the connectionname is not null, load the connection description and prepopulate everything with what comes from it. + if (connectionName != null && connectionName.length() > 0) { + connection = connMgr.load(connectionName); + } + } + // Set up default fields. + boolean isNew = true; + String description = ""; + String className = ""; + int maxConnections = 10; + ConfigParams parameters = new ConfigParams(); + + // If there's a connection object, set up all our parameters from it. + if (connection != null) { + // Set up values + isNew = connection.getIsNew(); + connectionName = connection.getName(); + description = connection.getDescription(); + className = connection.getClassName(); + parameters = connection.getConfigParams(); + maxConnections = connection.getMaxConnections(); + } else + connectionName = null; + + if (connectionName == null) + connectionName = ""; + + // Initialize tabs array. + ArrayList tabsArray = new ArrayList(); + + // Set up the predefined tabs + tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(), "editoutput.Name")); + tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(), "editoutput.Type")); + if (className.length() > 0) + tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(), "editoutput.Throttling")); - // "Type" tab - if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type"))) - { %> - - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.ConnectionTypeColon")%> -<% - if (className.length() > 0) - { - String value = connectorManager.getDescription(className); - if (value == null) - { -%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> -<% - } - else - { -%> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> -<% - } -%> - -<% - } - else - { - int i = 0; -%> - -<% - } -%> -
-<% - } - else - { - // Hiddens for the "Type" tab -%> - -<% - } - - // The "Throttling" tab - if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Throttling"))) - { -%> - - - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.MaxConnectionsColon")%>
-<% - } - else - { - // Hiddens for "Throttling" tab -%> - -<% - } + +
+ <% + OutputConnectorFactory.outputConfigurationHeader(threadContext, className, new org.apache.manifoldcf.ui.jsp.JspWrapper(out, adminprofile), pageContext.getRequest().getLocale(), parameters, tabsArray); + %> +
+ + +
+
+ <% + // Get connector list; need this to decide what to do + IResultSet set = connectorManager.getConnectors(); + if (set.getRowCount() == 0) { + %> +
+

<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "editoutput.NoOutputConnectorsRegistered")%> +

+
+ <% + } else { + %> +
+ + + + + + +
+ +
+ <% + + + // Name tab + if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(), "editoutput.Name"))) { + %> +
+
+ + <% + // If the connection doesn't exist yet, we are allowed to change the name. + if (connection == null || connectionName.length() < 1) { + %> + + <% + } else { + %> + + + <% + } + %> +
+
+ + +
+
+ <% + } else { + // Hiddens for the Name tab + %> + + + <% + } + + + // "Type" tab + if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(), "editoutput.Type"))) { + %> +
+
+ + <% + if (className.length() > 0) { + String value = connectorManager.getDescription(className); + if (value == null) { + %> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "editoutput.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> + + <% + } else { + %> + + <% + } + %> + + <% + } else { + int i = 0; + %> + + <% + } + %> +
+ <% + } else { + // Hiddens for the "Type" tab + %> + + <% + } + + + // The "Throttling" tab + if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(), "editoutput.Throttling"))) { + %> +
+
+ + +
+
+ <% + } else { + // Hiddens for "Throttling" tab + %> + + <% + } + + if (className.length() > 0) + OutputConnectorFactory.outputConfigurationBody(threadContext, className, new org.apache.manifoldcf.ui.jsp.JspWrapper(out, adminprofile), pageContext.getRequest().getLocale(), parameters, tabName); + + %> +
+
+
+
+ <% + if (className.length() > 0) { + %> + " + onClick="javascript:Save()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.SaveThisOutputConnection")%>"/> + <% + } else { + if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(), "editoutput.Type"))) { + %> + " + onClick="javascript:Continue()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>"/> + <% + } + } + %> +  " + onClick="javascript:Cancel()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>"/> +
+
+ + + <% + } + %> + + +
+
+
+ +<% +} catch (ManifoldCFException e) { + e.printStackTrace(); + variableContext.setParameter("text", e.getMessage()); + variableContext.setParameter("target", "listoutputs.jsp"); %> - + <% - } + } %> Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp?rev=1684303&r1=1684302&r2=1684303&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp Tue Jun 9 01:30:36 2015 @@ -2,480 +2,423 @@ <% -/* $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. + */ %> <% - // The contract of this edit page is as follows. It is either called directly, in which case it is expected to be creating - // a connection or beginning the process of editing an existing connection, or it is called via redirection from execute.jsp, in which case - // the connection object being edited will be placed in the thread context under the name "ConnectionObject". - try - { - // Get the connection manager handle - ITransformationConnectionManager connMgr = TransformationConnectionManagerFactory.make(threadContext); - // Also get the list of available connectors - ITransformationConnectorManager connectorManager = TransformationConnectorManagerFactory.make(threadContext); - - // Figure out what the current tab name is. - String tabName = variableContext.getParameter("tabname"); - if (tabName == null || tabName.length() == 0) - tabName = Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Name"); - String connectionName = null; - ITransformationConnection connection = (ITransformationConnection)threadContext.get("ConnectionObject"); - if (connection == null) - { - // We did not go through execute.jsp - // We might have received an argument specifying the connection name. - connectionName = variableContext.getParameter("connname"); - // If the connectionname is not null, load the connection description and prepopulate everything with what comes from it. - if (connectionName != null && connectionName.length() > 0) - { - connection = connMgr.load(connectionName); - } - } - - // Set up default fields. - boolean isNew = true; - String description = ""; - String className = ""; - int maxConnections = 10; - ConfigParams parameters = new ConfigParams(); - - // If there's a connection object, set up all our parameters from it. - if (connection != null) - { - // Set up values - isNew = connection.getIsNew(); - connectionName = connection.getName(); - description = connection.getDescription(); - className = connection.getClassName(); - parameters = connection.getConfigParams(); - maxConnections = connection.getMaxConnections(); - } - else - connectionName = null; - - if (connectionName == null) - connectionName = ""; - - // Initialize tabs array. - ArrayList tabsArray = new ArrayList(); - - // Set up the predefined tabs - tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Name")); - tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Type")); - if (className.length() > 0) - tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Throttling")); - -%> - - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.ApacheManifoldCFEditTransformationConnection")%> - - - -<% - TransformationConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); -%> - - - - - - - - -
-<% - // Get connector list; need this to decide what to do - IResultSet set = connectorManager.getConnectors(); - if (set.getRowCount() == 0) - { -%> -

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection2")%>

-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NoTransformationConnectorsRegistered")%>
-<% - } - else - { -%> - -
- - - - - - - - - - - - - -<% - int tabNum = 0; - while (tabNum < tabsArray.size()) - { - String tab = (String)tabsArray.get(tabNum++); - if (tab.equals(tabName)) - { -%> - -<% - } - else - { -%> - -<% - } - } -%> - - -
-<% - if (description.length() > 0) - { -%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>' -<% - } - else - { -%> - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditATransformationConnection")%> -<% - } -%> -
<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%>
-<% + // The contract of this edit page is as follows. It is either called directly, in which case it is expected to be creating + // a connection or beginning the process of editing an existing connection, or it is called via redirection from execute.jsp, in which case + // the connection object being edited will be placed in the thread context under the name "ConnectionObject". + try { + // Get the connection manager handle + ITransformationConnectionManager connMgr = TransformationConnectionManagerFactory.make(threadContext); + // Also get the list of available connectors + ITransformationConnectorManager connectorManager = TransformationConnectorManagerFactory.make(threadContext); + + // Figure out what the current tab name is. + String tabName = variableContext.getParameter("tabname"); + if (tabName == null || tabName.length() == 0) + tabName = Messages.getString(pageContext.getRequest().getLocale(), "edittransformation.Name"); + String connectionName = null; + ITransformationConnection connection = (ITransformationConnection) threadContext.get("ConnectionObject"); + if (connection == null) { + // We did not go through execute.jsp + // We might have received an argument specifying the connection name. + connectionName = variableContext.getParameter("connname"); + // If the connectionname is not null, load the connection description and prepopulate everything with what comes from it. + if (connectionName != null && connectionName.length() > 0) { + connection = connMgr.load(connectionName); + } + } + // Set up default fields. + boolean isNew = true; + String description = ""; + String className = ""; + int maxConnections = 10; + ConfigParams parameters = new ConfigParams(); + + // If there's a connection object, set up all our parameters from it. + if (connection != null) { + // Set up values + isNew = connection.getIsNew(); + connectionName = connection.getName(); + description = connection.getDescription(); + className = connection.getClassName(); + parameters = connection.getConfigParams(); + maxConnections = connection.getMaxConnections(); + } else + connectionName = null; + + if (connectionName == null) + connectionName = ""; + + // Initialize tabs array. + ArrayList tabsArray = new ArrayList(); + + // Set up the predefined tabs + tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(), "edittransformation.Name")); + tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(), "edittransformation.Type")); + if (className.length() > 0) + tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(), "edittransformation.Throttling")); - // Name tab - if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Name"))) - { -%> - - - - - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NameColon")%> -<% - // If the connection doesn't exist yet, we are allowed to change the name. - if (connection == null || connectionName.length() < 1) - { -%> - -<% - } - else - { -%> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - -<% - } %> -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.DescriptionColon")%> - -
-<% - } - else - { - // Hiddens for the Name tab -%> - - -<% - } + +<% + TransformationConnectorFactory.outputConfigurationHeader(threadContext, className, new org.apache.manifoldcf.ui.jsp.JspWrapper(out, adminprofile), pageContext.getRequest().getLocale(), parameters, tabsArray); +%> + + +
+
+ + <% + // Get connector list; need this to decide what to do + IResultSet set = connectorManager.getConnectors(); + if (set.getRowCount() == 0) { + %> +
+

<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "edittransformation.NoTransformationConnectorsRegistered")%> +

+
+ <% + } else { + %> +
+ + + + + + +
+ +
+ <% + // Name tab + if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(), "edittransformation.Name"))) { + %> +
+
+ + <% + // If the connection doesn't exist yet, we are allowed to change the name. + if (connection == null || connectionName.length() < 1) { + %> + + <% + } else { + %> + + + <% + } + %> +
+
+ + +
+
+ <% + } else { + // Hiddens for the Name tab + %> + + + <% + } + + + // "Type" tab + if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(), "edittransformation.Type"))) { + %> +
+
+ + <% + if (className.length() > 0) { + String value = connectorManager.getDescription(className); + if (value == null) { + %> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "edittransformation.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> + + <% + } else { + %> + + <% + } + %> + + <% + } else { + int i = 0; + %> + + <% + } + %> +
+ <% + } else { + // Hiddens for the "Type" tab + %> + + <% + } + + + // The "Throttling" tab + if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(), "edittransformation.Throttling"))) { + %> +
+
+ + +
+
+ <% + } else { + // Hiddens for "Throttling" tab + %> + + <% + } + + if (className.length() > 0) + TransformationConnectorFactory.outputConfigurationBody(threadContext, className, new org.apache.manifoldcf.ui.jsp.JspWrapper(out, adminprofile), pageContext.getRequest().getLocale(), parameters, tabName); + + %> +
+
+
+
+ <% + if (className.length() > 0) { + %> + " + onClick="javascript:Save()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.SaveThisTransformationConnection")%>"/> + <% + } else { + if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(), "edittransformation.Type"))) { + %> + " + onClick="javascript:Continue()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.ContinueToNextPage")%>"/> + <% + } + } + %> + " + onClick="javascript:Cancel()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"/> +
+
+ + + <% + } + %> + +
+
+
+ +<% +} catch (ManifoldCFException e) { + e.printStackTrace(); + variableContext.setParameter("text", e.getMessage()); + variableContext.setParameter("target", "listtransformations.jsp"); %> - + <% - } + } %> Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/error.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/error.jsp?rev=1684303&r1=1684302&r2=1684303&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/error.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/error.jsp Tue Jun 9 01:30:36 2015 @@ -2,64 +2,44 @@ <% -/* $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. + */ %> - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.ApacheManifoldCFError")%> - - - - - - - - - - - -
-

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.Error")%>

+ <% - // These have to be fetched from request rather than variableContext since error - // forwards screw up the multipart wrapper - String errorText = variableContext.getParameter("text"); - String target = variableContext.getParameter("target"); + // These have to be fetched from request rather than variableContext since error + // forwards screw up the multipart wrapper + String errorText = variableContext.getParameter("text"); + String target = variableContext.getParameter("target"); %> - - - - -
<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(errorText)%>
">OK
- -
- - +
+

Error!

+ <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(errorText)%> +
+">OK \ No newline at end of file