Return-Path: 
 <connectors-commits-return-278-apmail-incubator-connectors-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Received: (qmail 5073 invoked from network); 11 May 2010 18:28:11 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 11 May 2010 18:28:11 -0000
Received: (qmail 72281 invoked by uid 500); 11 May 2010 18:28:11 -0000
Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org
Received: (qmail 72246 invoked by uid 500); 11 May 2010 18:28:11 -0000
Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:connectors-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:connectors-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:connectors-commits@incubator.apache.org>
List-Id: <connectors-commits.incubator.apache.org>
Reply-To: connectors-dev@incubator.apache.org
Delivered-To: mailing list connectors-commits@incubator.apache.org
Received: (qmail 72239 invoked by uid 99); 11 May 2010 18:28:10 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 May 2010 18:28:10 +0000
X-ASF-Spam-Status: No, hits=-1999.9 required=10.0
	tests=ALL_TRUSTED,AWL,WEIRD_QUOTING
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 May 2010 18:28:09 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8C7EB23888FE; Tue, 11 May 2010 18:27:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r943218 - in
 /incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio:
 editconfig.jsp headerconfig.jsp
Date: Tue, 11 May 2010 18:27:49 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100511182749.8C7EB23888FE@eris.apache.org>

Author: kwright
Date: Tue May 11 18:27:48 2010
New Revision: 943218

URL: http://svn.apache.org/viewvc?rev=943218&view=rev
Log:
Make MetaCarta at least not be visible on the various tabs for the Meridio Authority.

Modified:
    incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/editconfig.jsp
    incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/headerconfig.jsp

Modified: incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/editconfig.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/editconfig.jsp?rev=943218&r1=943217&r2=943218&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/editconfig.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/editconfig.jsp Tue May 11 18:27:48 2010
@@ -203,39 +203,39 @@
 <%
 	}
 
-	// The "MetaCarta Service Server" tab
-	if (tabName.equals("MetaCarta Service Server"))
+	// The "User Service Server" tab
+	if (tabName.equals("User Service Server"))
 	{
 %>
 <table class="displaytable">
 	<tr><td class="separator" colspan="2"><hr/></td></tr>
 	<tr>
-		<td class="description"><nobr>MetaCarta webservice server protocol:</nobr></td><td class="value"><select name="metacartawsServerProtocol"><option value="http" <%=((metacartawsServerProtocol.equals("http"))?"selected=\"true\"":"")%>>http</option><option value="https" <%=(metacartawsServerProtocol.equals("https")?"selected=\"true\"":"")%>>https</option></select></td>
+		<td class="description"><nobr>User webservice server protocol:</nobr></td><td class="value"><select name="metacartawsServerProtocol"><option value="http" <%=((metacartawsServerProtocol.equals("http"))?"selected=\"true\"":"")%>>http</option><option value="https" <%=(metacartawsServerProtocol.equals("https")?"selected=\"true\"":"")%>>https</option></select></td>
 	</tr>
 	<tr>
-		<td class="description"><nobr>MetaCarta webservice server name:</nobr></td><td class="value"><input type="text" size="64" name="metacartawsServerName" value='<%=org.apache.lcf.ui.util.Encoder.attributeEscape(metacartawsServerName)%>'/></td>
+		<td class="description"><nobr>User webservice server name:</nobr></td><td class="value"><input type="text" size="64" name="metacartawsServerName" value='<%=org.apache.lcf.ui.util.Encoder.attributeEscape(metacartawsServerName)%>'/></td>
 	</tr>
         <tr>
-		<td class="description"><nobr>MetaCarta webservice server port:</nobr></td><td class="value"><input type="text" size="5" name="metacartawsServerPort" value='<%=metacartawsServerPort%>'/></td>
+		<td class="description"><nobr>User webservice server port:</nobr></td><td class="value"><input type="text" size="5" name="metacartawsServerPort" value='<%=metacartawsServerPort%>'/></td>
 	</tr>
         <tr>
-		<td class="description"><nobr>MetaCarta webservice location:</nobr></td><td class="value"><input type="text" size="64" name="metacartawsLocation" value='<%=org.apache.lcf.ui.util.Encoder.attributeEscape(metacartawsLocation)%>'/></td>
+		<td class="description"><nobr>User webservice location:</nobr></td><td class="value"><input type="text" size="64" name="metacartawsLocation" value='<%=org.apache.lcf.ui.util.Encoder.attributeEscape(metacartawsLocation)%>'/></td>
 	</tr>
 	<tr>
 		<td class="separator" colspan="2"><hr/></td>
 	</tr>
 	<tr>
-		<td class="description"><nobr>MetaCarta webservice server proxy host:</nobr></td><td class="value"><input type="text" size="64" name="metacartawsProxyHost" value='<%=org.apache.lcf.ui.util.Encoder.attributeEscape(metacartawsProxyHost)%>'/></td>
+		<td class="description"><nobr>User webservice server proxy host:</nobr></td><td class="value"><input type="text" size="64" name="metacartawsProxyHost" value='<%=org.apache.lcf.ui.util.Encoder.attributeEscape(metacartawsProxyHost)%>'/></td>
 	</tr>
 	<tr>
-		<td class="description"><nobr>MetaCarta webservice server proxy port:</nobr></td><td class="value"><input type="text" size="5" name="metacartawsProxyPort" value='<%=metacartawsProxyPort%>'/></td>
+		<td class="description"><nobr>User webservice server proxy port:</nobr></td><td class="value"><input type="text" size="5" name="metacartawsProxyPort" value='<%=metacartawsProxyPort%>'/></td>
 	</tr>
 </table>
 <%
 	}
 	else
 	{
-		// Hiddens for the MetaCarta Service Server tab.
+		// Hiddens for the User Service Server tab.
 %>
 <input type="hidden" name="metacartawsServerProtocol" value='<%=metacartawsServerProtocol%>'/>
 <input type="hidden" name="metacartawsServerName" value='<%=org.apache.lcf.ui.util.Encoder.attributeEscape(metacartawsServerName)%>'/>

Modified: incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/headerconfig.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/headerconfig.jsp?rev=943218&r1=943217&r2=943218&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/headerconfig.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/meridio/headerconfig.jsp Tue May 11 18:27:48 2010
@@ -44,7 +44,7 @@
 
 	tabsArray.add("Document Server");
 	tabsArray.add("Records Server");
-	tabsArray.add("MetaCarta Service Server");
+	tabsArray.add("User Service Server");
 	tabsArray.add("Credentials");
 
 %>
@@ -117,8 +117,8 @@
 		}
 		if (editconnection.metacartawsServerName.value == "")
 		{
-			alert("Please fill in a Meridio MetaCarta Service server name");
-			SelectTab("MetaCarta Service Server");
+			alert("Please fill in a User Service server name");
+			SelectTab("User Service Server");
 			editconnection.metacartawsServerName.focus();
 			return false;
 		}
@@ -139,8 +139,8 @@
 		}
 		if (editconnection.metacartawsServerPort.value != "" && !isInteger(editconnection.metacartawsServerPort.value))
 		{
-			alert("Please supply a Meridio MetaCarta Service port number, or none for default");
-			SelectTab("MetaCarta Service Server");
+			alert("Please supply a User Service port number, or none for default");
+			SelectTab("User Service Server");
 			editconnection.metacartawsServerPort.focus();
 			return false;
 		}