You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/12/18 13:43:41 UTC
svn commit: r1551924 - in /manifoldcf/trunk: ./ framework/crawler-ui/src/main/webapp/ framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/

Author: kwright
Date: Wed Dec 18 12:43:40 2013
New Revision: 1551924

URL: http://svn.apache.org/r1551924
Log:
Fix for CONNECTORS-844.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp
    manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
    manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1551924&r1=1551923&r2=1551924&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Dec 18 12:43:40 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.5-dev =====================
 
+CONNECTORS-844: Remove "per JVM" from connection maximum
+messages in crawler UI.
+(Karl Wright)
+
 CONNECTORS-842: Update documentation to describe the functioning
 of the org.apache.manifoldcf.mysql.client property.
 (Chris Griffin, Karl Wright)

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1551924&r1=1551923&r2=1551924&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp Wed Dec 18 12:43:40 2013
@@ -544,7 +544,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.MaxConnections")%></nobr><br/><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.PerJVMColon")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.MaxConnectionsColon")%></nobr></td>
 				<td class="value" colspan="4"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 		    </table>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp?rev=1551924&r1=1551923&r2=1551924&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp Wed Dec 18 12:43:40 2013
@@ -470,7 +470,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="2"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editconnection.Maxconnections")%></nobr><br/><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editconnection.PerJVMColon")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editconnection.MaxconnectionsColon")%></nobr></td>
 				<td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 			<tr>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp?rev=1551924&r1=1551923&r2=1551924&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp Wed Dec 18 12:43:40 2013
@@ -471,7 +471,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.MaxConnections")%></nobr><br/><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.PerJVMColon")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.MaxConnectionsColon")%></nobr></td>
 				<td class="value" colspan="4"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 		    </table>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1551924&r1=1551923&r2=1551924&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp Wed Dec 18 12:43:40 2013
@@ -400,7 +400,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="2"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.MaxConnections")%></nobr><br/><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.PerJVMColon")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.MaxConnectionsColon")%></nobr></td>
 				<td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 		    </table>

Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1551924&r1=1551923&r2=1551924&view=diff
==============================================================================
--- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original)
+++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Wed Dec 18 12:43:40 2013
@@ -107,8 +107,7 @@ editoutput.Cancel=Cancel
 editoutput.CancelOutputConnectionEditing=Cancel output connection editing
 editoutput.Save=Save
 editoutput.SaveThisOutputConnection=Save this output connection
-editoutput.MaxConnections=Max connections
-editoutput.PerJVMColon=(per JVM):
+editoutput.MaxConnectionsColon=Max connections:
 editoutput.EditOutputConnection=Edit output connection
 editoutput.NameColon=Name:
 editoutput.DescriptionColon=Description:
@@ -203,8 +202,7 @@ editauthority.DescriptionColon=Descripti
 editauthority.ConnectionTypeColon=Connection type:
 editauthority.Continue=Continue
 editauthority.ContinueToNextPage=Continue to next page
-editauthority.MaxConnections=Max connections
-editauthority.PerJVMColon=(per JVM):
+editauthority.MaxConnectionsColon=Max connections:
 editauthority.Cancel=Cancel
 editauthority.CancelAuthorityEditing=Cancel authority editing
 editauthority.Save=Save
@@ -236,8 +234,7 @@ editmapper.DescriptionColon=Description:
 editmapper.ConnectionTypeColon=Connection type:
 editmapper.Continue=Continue
 editmapper.ContinueToNextPage=Continue to next page
-editmapper.MaxConnections=Max connections
-editmapper.PerJVMColon=(per JVM):
+editmapper.MaxConnectionsColon=Max connections:
 editmapper.Cancel=Cancel
 editmapper.CancelMappingEditing=Cancel mapping editing
 editmapper.Save=Save
@@ -279,8 +276,7 @@ editconnection.Cancel=Cancel
 editconnection.CancelConnectionEditing=Cancel connection editing
 editconnection.NameColon=Name:
 editconnection.DescriptionColon=Description:
-editconnection.Maxconnections=Max connections
-editconnection.PerJVMColon=(per JVM):
+editconnection.MaxconnectionsColon=Max connections:
 editconnection.ThrottlingColon=Throttling:
 editconnection.Add=Add
 editconnection.BinRegularExpression=Bin regular expression

Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1551924&r1=1551923&r2=1551924&view=diff
==============================================================================
--- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original)
+++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Wed Dec 18 12:43:40 2013
@@ -107,8 +107,7 @@ editoutput.Cancel=ãã£ã³ã
 editoutput.CancelOutputConnectionEditing=åºåã³ãã¯ã·ã§ã³ã®ç·¨éããã£ã³ã»ã«
 editoutput.Save=ä¿å
 editoutput.SaveThisOutputConnection=åºåã³ãã¯ã·ã§ã³ãä¿å
-editoutput.MaxConnections=æå¤§ã³ãã¯ã·ã§ã³æ°
-editoutput.PerJVMColon=ï¼ï¼JVMï¼ï¼
+editoutput.MaxConnectionsColon=æå¤§ã³ãã¯ã·ã§ã³æ°ï¼
 editoutput.EditOutputConnection=åºåã³ãã¯ã·ã§ã³ãç·¨é
 editoutput.NameColon=ååï¼
 editoutput.DescriptionColon=èª¬æï¼
@@ -203,8 +202,7 @@ editauthority.DescriptionColon=èª¬æ�
 editauthority.ConnectionTypeColon=ã³ãã¯ã·ã§ã³ã¿ã¤ãï¼
 editauthority.Continue=æ¬¡ã¸
 editauthority.ContinueToNextPage=æ¬¡ã®ãã¼ã¸ã«é²ã
-editauthority.MaxConnections=æå¤§ã³ãã¯ã·ã§ã³æ°
-editauthority.PerJVMColon=ï¼ï¼JVMï¼ï¼
+editauthority.MaxConnectionsColon=æå¤§ã³ãã¯ã·ã§ã³æ°ï¼
 editauthority.Cancel=ãã£ã³ã»ã«
 editauthority.CancelAuthorityEditing=æ¨©éã®ç·¨éããã£ã³ã»ã«
 editauthority.Save=ä¿å
@@ -236,8 +234,7 @@ editmapper.DescriptionColon=èª¬æ
 editmapper.ConnectionTypeColon=ã³ãã¯ã·ã§ã³ã¿ã¤ãï¼
 editmapper.Continue=æ¬¡ã¸
 editmapper.ContinueToNextPage=æ¬¡ã®ãã¼ã¸ã«é²ã
-editmapper.MaxConnections=æå¤§ã³ãã¯ã·ã§ã³æ°
-editmapper.PerJVMColon=ï¼ï¼JVMï¼ï¼
+editmapper.MaxConnectionsColon=æå¤§ã³ãã¯ã·ã§ã³æ°ï¼
 editmapper.Cancel=ãã£ã³ã»ã«
 editmapper.CancelMappingEditing=ãããã³ã°ã®ç·¨éããã£ã³ã»ã«
 editmapper.Save=ä¿å
@@ -279,8 +276,7 @@ editconnection.Cancel=ãã£ã³
 editconnection.CancelConnectionEditing=ã³ãã¯ã·ã§ã³ã®ç·¨éããã£ã³ã»ã«
 editconnection.NameColon=ååï¼
 editconnection.DescriptionColon=èª¬æï¼
-editconnection.Maxconnections=æå¤§ã³ãã¯ã·ã§ã³æ°
-editconnection.PerJVMColon=ï¼ï¼JVMï¼ï¼
+editconnection.MaxconnectionsColon=æå¤§ã³ãã¯ã·ã§ã³æ°ï¼
 editconnection.ThrottlingColon=ã¹ããããªã³ã°ï¼
 editconnection.Add=è¿½å 
 editconnection.BinRegularExpression=Binæ£è¦è¡¨ç¾