Author: kwright
Date: Sun Jul 22 01:30:02 2012
New Revision: 1364205
URL: http://svn.apache.org/viewvc?rev=1364205&view=rev
Log:
Fix for CONNECTORS-488. Add a Cache tab for all authority connectors that
support caching.
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_en_US.properties
manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_ja_JP.properties
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LiveLinkParameters.java
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties
manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_en_US.properties
manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_ja_JP.properties
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-488:r1363249-1364203
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sun Jul 22 01:30:02 2012
@@ -3,6 +3,10 @@ $Id$
======================= 0.7-dev =====================
+CONNECTORS-488: Add Cache tab for all authority connectors that
+support caching, so that the cache parameters can be varied.
+(Karl Wright)
+
CONNECTORS-470: Extend SharePoint connector to work with
SharePoint 2010.
(Ahmet Arslan, Fatih Samet Cetin, Joe Becknell, Karl Wright)
Modified:
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
(original)
+++
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
Sun Jul 22 01:30:02 2012
@@ -40,7 +40,9 @@ public class AuthorityConnector extends
public static final String CONFIG_PARAM_DOMAIN = "domain";
public static final String CONFIG_PARAM_CASEINSENSITIVE =
"usernamecaseinsensitive";
public static final String CONFIG_PARAM_USESYSTEMACLS = "usesystemacls";
-
+ public static final String CONFIG_PARAM_CACHELIFETIME = "cachelifetimemins";
+ public static final String CONFIG_PARAM_CACHELRUSIZE = "cachelrusize";
+
protected String docbaseName = null;
protected String userName = null;
protected String password = null;
@@ -66,6 +68,11 @@ public class AuthorityConnector extends
protected static final long timeToRelease = 300000L;
+ private String cacheLifetime = null;
+ private String cacheLRUsize = null;
+ private long responseLifetime = 60000L;
+ private int LRUsize = 1000;
+
public AuthorityConnector()
{
super();
@@ -127,6 +134,16 @@ public class AuthorityConnector extends
protected void getSession()
throws ManifoldCFException
{
+ try
+ {
+ responseLifetime = Long.parseLong(this.cacheLifetime) * 60L * 1000L;
+ LRUsize = Integer.parseInt(this.cacheLRUsize);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new ManifoldCFException("Cache lifetime or Cache LRU size must be
an integer: "+e.getMessage(),e);
+ }
+
if (session == null)
{
// This is the stuff that used to be in connect()
@@ -614,7 +631,7 @@ public class AuthorityConnector extends
// Construct a cache description object
ICacheDescription objectDescription = new
AuthorizationResponseDescription(strUserNamePassedIn,docbaseName,userName,password,
- domain,caseInsensitive,useSystemAcls);
+ domain,caseInsensitive,useSystemAcls,responseLifetime,LRUsize);
// Enter the cache
ICacheHandle ch = cacheManager.enterCache(new
ICacheDescription[]{objectDescription},null,null);
@@ -910,6 +927,13 @@ public class AuthorityConnector extends
else
useSystemAcls = false;
+ cacheLifetime = configParams.getParameter(CONFIG_PARAM_CACHELIFETIME);
+ if (cacheLifetime == null)
+ cacheLifetime = "1";
+ cacheLRUsize = configParams.getParameter(CONFIG_PARAM_CACHELRUSIZE);
+ if (cacheLRUsize == null)
+ cacheLRUsize = "1000";
+
}
/** Disconnect from Documentum.
@@ -972,6 +996,10 @@ public class AuthorityConnector extends
userName = null;
password = null;
domain = null;
+
+ cacheLifetime = null;
+ cacheLRUsize = null;
+
}
/** This method is periodically called for all connectors that are connected
but not
@@ -1005,6 +1033,8 @@ public class AuthorityConnector extends
tabsArray.add(Messages.getString(locale,"DCTM.Docbase"));
tabsArray.add(Messages.getString(locale,"DCTM.UserMapping"));
tabsArray.add(Messages.getString(locale,"DCTM.SystemACLs"));
+ tabsArray.add(Messages.getString(locale,"DCTM.Cache"));
+
out.print(
"<script type=\"text/javascript\">\n"+
"<!--\n"+
@@ -1031,6 +1061,34 @@ public class AuthorityConnector extends
" editconnection.docbasepassword.focus();\n"+
" return false;\n"+
" }\n"+
+" if (editconnection.cachelifetime.value == \"\")\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"DCTM.CacheLifetimeCannotBeNull") +
"\");\n"+
+" SelectTab(\"" + Messages.getBodyJavascriptString(locale,"DCTM.Cache") +
"\");\n"+
+" editconnection.cachelifetime.focus();\n"+
+" return false;\n"+
+" }\n"+
+" if (editconnection.cachelifetime.value != \"\" &&
!isInteger(editconnection.cachelifetime.value))\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"DCTM.CacheLifetimeMustBeAnInteger") +
"\");\n"+
+" SelectTab(\"" + Messages.getBodyJavascriptString(locale,"DCTM.Cache") +
"\");\n"+
+" editconnection.cachelifetime.focus();\n"+
+" return false;\n"+
+" }\n"+
+" if (editconnection.cachelrusize.value == \"\")\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"DCTM.CacheLRUSizeCannotBeNull") +
"\");\n"+
+" SelectTab(\"" + Messages.getBodyJavascriptString(locale,"DCTM.Cache") +
"\");\n"+
+" editconnection.cachelrusize.focus();\n"+
+" return false;\n"+
+" }\n"+
+" if (editconnection.cachelrusize.value != \"\" &&
!isInteger(editconnection.cachelrusize.value))\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"DCTM.CacheLRUSizeMustBeAnInteger") +
"\");\n"+
+" SelectTab(\"" + Messages.getBodyJavascriptString(locale,"DCTM.Cache") +
"\");\n"+
+" editconnection.cachelrusize.focus();\n"+
+" return false;\n"+
+" }\n"+
" return true;\n"+
"}\n"+
"\n"+
@@ -1077,6 +1135,14 @@ public class AuthorityConnector extends
if (useSystemAcls == null)
useSystemAcls = "true";
+ String cacheLifetime = parameters.getParameter(CONFIG_PARAM_CACHELIFETIME);
+ if (cacheLifetime == null)
+ cacheLifetime = "1";
+
+ String cacheLRUsize = parameters.getParameter(CONFIG_PARAM_CACHELRUSIZE);
+ if (cacheLRUsize == null)
+ cacheLRUsize = "1000";
+
// "Docbase" tab
if (tabName.equals(Messages.getString(locale,"DCTM.Docbase")))
{
@@ -1176,6 +1242,32 @@ public class AuthorityConnector extends
"<input type=\"hidden\" name=\"usesystemacls\" value=\""+useSystemAcls+"\"/>\n"
);
}
+
+ // "Cache" tab
+ if(tabName.equals(Messages.getString(locale,"DCTM.Cache")))
+ {
+ out.print(
+"<table class=\"displaytable\">\n"+
+" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"DCTM.CacheLifetime") + "</nobr></td>\n"+
+" <td class=\"value\"><input type=\"text\" size=\"5\"
name=\"cachelifetime\" value=\"" +
org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime) + "\"/> "
+ Messages.getBodyString(locale,"DCTM.minutes") + "</td>\n"+
+" </tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"DCTM.CacheLRUSize") + "</nobr></td>\n"+
+" <td class=\"value\"><input type=\"text\" size=\"5\" name=\"cachelrusize\"
value=\"" + org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLRUsize)
+ "\"/></td>\n"+
+" </tr>\n"+
+"</table>\n"
+ );
+ }
+ else
+ {
+ // Hiddens for "Cache" tab
+ out.print(
+"<input type=\"hidden\" name=\"cachelifetime\" value=\"" +
org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime) + "\"/>\n"+
+"<input type=\"hidden\" name=\"cachelrusize\" value=\"" +
org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLRUsize) + "\"/>\n"
+ );
+ }
}
/** Process a configuration post.
@@ -1216,6 +1308,14 @@ public class AuthorityConnector extends
if (useSystemAcls != null)
parameters.setParameter(org.apache.manifoldcf.crawler.authorities.DCTM.AuthorityConnector.CONFIG_PARAM_USESYSTEMACLS,useSystemAcls);
+ String cacheLifetime = variableContext.getParameter("cachelifetime");
+ if (cacheLifetime != null)
+ parameters.setParameter(CONFIG_PARAM_CACHELIFETIME,cacheLifetime);
+
+ String cacheLRUsize = variableContext.getParameter("cachelrusize");
+ if (cacheLRUsize != null)
+ parameters.setParameter(CONFIG_PARAM_CACHELRUSIZE,cacheLRUsize);
+
return null;
}
@@ -1269,8 +1369,6 @@ public class AuthorityConnector extends
);
}
- protected static long responseLifetime = 60000L;
- protected static int LRUsize = 1000;
protected static StringSet emptyStringSet = new StringSet();
/** This is the cache object descriptor for cached access tokens from
@@ -1288,10 +1386,14 @@ public class AuthorityConnector extends
protected boolean useSystemACLs;
/** The expiration time */
protected long expirationTime = -1;
+ /** The response lifetime */
+ protected long responseLifetime;
/** Constructor. */
public AuthorizationResponseDescription(String userName, String
docbaseName,
- String adminUserName, String adminPassword, String domain, boolean
caseInsensitive, boolean useSystemACLs)
+ String adminUserName, String adminPassword, String domain,
+ boolean caseInsensitive, boolean useSystemACLs,
+ long responseLifetime, int LRUsize)
{
super("DocumentumDirectoryAuthority",LRUsize);
this.userName = userName;
@@ -1301,6 +1403,7 @@ public class AuthorityConnector extends
this.domain = domain;
this.caseInsensitive = caseInsensitive;
this.useSystemACLs = useSystemACLs;
+ this.responseLifetime = responseLifetime;
}
/** Return the invalidation keys for this object. */
Modified:
manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_en_US.properties?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_en_US.properties
(original)
+++
manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_en_US.properties
Sun Jul 22 01:30:02 2012
@@ -15,6 +15,10 @@
DCTM.NoAccessTokensPresent=No access tokens present
DCTM.NoAccessTokensSpecified=No access tokens specified
+DCTM.Cache=Cache
+DCTM.CacheLifetime=Cache lifetime:
+DCTM.CacheLRUSize=Cache LRU size:
+DCTM.minutes=minutes
DCTM.Docbase=Docbase
DCTM.DocbaseName=Docbase name:
DCTM.DocbaseUserName=Docbase user name:
@@ -77,4 +81,8 @@ DCTM.ServiceInterruptionOrInvalidCredent
DCTM.ContentLength=Content length:
DCTM.UserMapping=User Mapping
DCTM.SystemACLs=System ACLs
+DCTM.CacheLifetimeCannotBeNull=Cache lifetime cannot be null
+DCTM.CacheLifetimeMustBeAnInteger=Cache lifetime must be an integer
+DCTM.CacheLRUSizeCannotBeNull=Cache LRU size cannot be null
+DCTM.CacheLRUSizeMustBeAnInteger=Cache LRU size must be an integer
Modified:
manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_ja_JP.properties?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_ja_JP.properties
(original)
+++
manifoldcf/trunk/connectors/documentum/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/authorities/DCTM/common_ja_JP.properties
Sun Jul 22 01:30:02 2012
@@ -15,6 +15,10 @@
DCTM.NoAccessTokensPresent=ã¢ã¯ã»ã¹ãã¼ã¯ã³ãåå¨ãã¾ãã
DCTM.NoAccessTokensSpecified=ã¢ã¯ã»ã¹ãã¼ã¯ã³ãæªå®ç¾©ã§ã
+DCTM.Cache=ãã£ãã·ã¥
+DCTM.CacheLifetime=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ï¼
+DCTM.CacheLRUSize=ãã£ãã·ã¥LRUãµã¤ãºï¼
+DCTM.minutes=å
DCTM.Docbase=Docbase
DCTM.DocbaseName=Docbaseåï¼
DCTM.DocbaseUserName=Docbaseã¦ã¼ã¶åï¼
@@ -77,3 +81,7 @@ DCTM.ServiceInterruptionOrInvalidCredent
DCTM.ContentLength=Content length:
DCTM.UserMapping=ã¦ã¼ã¶ããã
DCTM.SystemACLs=ã·ã¹ãã ACL
+DCTM.CacheLifetimeCannotBeNull=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ãå
¥åãã¦ãã ãã
+DCTM.CacheLifetimeMustBeAnInteger=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
+DCTM.CacheLRUSizeCannotBeNull=ãã£ãã·ã¥LRUãµã¤ãºãå
¥åãã¦ãã ãã
+DCTM.CacheLRUSizeMustBeAnInteger=ãã£ãã·ã¥LRUãµã¤ãºã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
Modified:
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LiveLinkParameters.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LiveLinkParameters.java?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LiveLinkParameters.java
(original)
+++
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LiveLinkParameters.java
Sun Jul 22 01:30:02 2012
@@ -58,7 +58,11 @@ public class LiveLinkParameters
public final static String livelinkKeystore = "Livelink SSL keystore";
/** User name mapping description. This replaces username regexp and
username spec below. */
public final static String userNameMapping = "Livelink user name map";
-
+ /** Cache time in seconds */
+ public final static String cacheLifetime = "Cache lifetime minutes";
+ /** Max LRU size */
+ public final static String cacheLRUSize = "Max cache LRU size";
+
// These two are deprecated
/** Username regexp */
public final static String userNameRegexp = "User name regexp";
Modified:
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
(original)
+++
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
Sun Jul 22 01:30:02 2012
@@ -61,6 +61,12 @@ public class LivelinkAuthority extends o
private LAPI_USERS LLUsers = null;
private LLSERVER llServer = null;
+ // Cache variables
+ private String cacheLifetime = null;
+ private String cacheLRUsize = null;
+ private long responseLifetime = 60000L;
+ private int LRUsize = 1000;
+
// Match map for username
private MatchMap matchMap = null;
@@ -141,6 +147,12 @@ public class LivelinkAuthority extends o
else
serverPort = new Integer(serverPortString).intValue();
+ cacheLifetime =
configParams.getParameter(LiveLinkParameters.cacheLifetime);
+ if (cacheLifetime == null)
+ cacheLifetime = "1";
+ cacheLRUsize = configParams.getParameter(LiveLinkParameters.cacheLRUSize);
+ if (cacheLRUsize == null)
+ cacheLRUsize = "1000";
}
@@ -148,6 +160,16 @@ public class LivelinkAuthority extends o
protected void attemptToConnect()
throws ManifoldCFException, ServiceInterruption
{
+ try
+ {
+ responseLifetime = Long.parseLong(this.cacheLifetime) * 60L * 1000L;
+ LRUsize = Integer.parseInt(this.cacheLRUsize);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new ManifoldCFException("Cache lifetime or Cache LRU size must be
an integer: "+e.getMessage(),e);
+ }
+
if (LLUsers == null)
{
@@ -239,6 +261,10 @@ public class LivelinkAuthority extends o
serverPort = -1;
serverUsername = null;
serverPassword = null;
+
+ cacheLifetime = null;
+ cacheLRUsize = null;
+
super.disconnect();
}
@@ -253,7 +279,7 @@ public class LivelinkAuthority extends o
{
// Construct a cache description object
ICacheDescription objectDescription = new
AuthorizationResponseDescription(userName,serverName,serverPort,
- serverUsername,serverPassword);
+ serverUsername,serverPassword,responseLifetime,LRUsize);
// Enter the cache
ICacheHandle ch = cacheManager.enterCache(new
ICacheDescription[]{objectDescription},null,null);
@@ -463,6 +489,8 @@ public class LivelinkAuthority extends o
{
tabsArray.add(Messages.getString(locale,"LivelinkConnector.Server"));
tabsArray.add(Messages.getString(locale,"LivelinkConnector.UserMapping"));
+ tabsArray.add(Messages.getString(locale,"LivelinkConnector.Cache"));
+
out.print(
"<script type=\"text/javascript\">\n"+
"<!--\n"+
@@ -506,6 +534,34 @@ public class LivelinkAuthority extends o
" editconnection.usernameregexp.focus();\n"+
" return false;\n"+
" }\n"+
+" if (editconnection.cachelifetime.value == \"\")\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"LivelinkConnector.CacheLifetimeCannotBeNull")
+ "\");\n"+
+" SelectTab(\"" +
Messages.getBodyJavascriptString(locale,"LivelinkConnector.Cache") + "\");\n"+
+" editconnection.cachelifetime.focus();\n"+
+" return false;\n"+
+" }\n"+
+" if (editconnection.cachelifetime.value != \"\" &&
!isInteger(editconnection.cachelifetime.value))\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"LivelinkConnector.CacheLifetimeMustBeAnInteger")
+ "\");\n"+
+" SelectTab(\"" +
Messages.getBodyJavascriptString(locale,"LivelinkConnector.Cache") + "\");\n"+
+" editconnection.cachelifetime.focus();\n"+
+" return false;\n"+
+" }\n"+
+" if (editconnection.cachelrusize.value == \"\")\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"LivelinkConnector.CacheLRUSizeCannotBeNull")
+ "\");\n"+
+" SelectTab(\"" +
Messages.getBodyJavascriptString(locale,"LivelinkConnector.Cache") + "\");\n"+
+" editconnection.cachelrusize.focus();\n"+
+" return false;\n"+
+" }\n"+
+" if (editconnection.cachelrusize.value != \"\" &&
!isInteger(editconnection.cachelrusize.value))\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"LivelinkConnector.CacheLRUSizeMustBeAnInteger")
+ "\");\n"+
+" SelectTab(\"" +
Messages.getBodyJavascriptString(locale,"LivelinkConnector.Cache") + "\");\n"+
+" editconnection.cachelrusize.focus();\n"+
+" return false;\n"+
+" }\n"+
" return true;\n"+
"}\n"+
"\n"+
@@ -531,15 +587,27 @@ public class LivelinkAuthority extends o
String serverName =
parameters.getParameter(org.apache.manifoldcf.crawler.connectors.livelink.LiveLinkParameters.serverName);
if (serverName == null)
serverName = "localhost";
+
String serverPort =
parameters.getParameter(org.apache.manifoldcf.crawler.connectors.livelink.LiveLinkParameters.serverPort);
if (serverPort == null)
serverPort = "2099";
+
String serverUserName =
parameters.getParameter(org.apache.manifoldcf.crawler.connectors.livelink.LiveLinkParameters.serverUsername);
if (serverUserName == null)
serverUserName = "";
+
String serverPassword =
parameters.getObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.livelink.LiveLinkParameters.serverPassword);
if (serverPassword == null)
serverPassword = "";
+
+ String cacheLifetime =
parameters.getParameter(LiveLinkParameters.cacheLifetime);
+ if (cacheLifetime == null)
+ cacheLifetime = "1";
+
+ String cacheLRUsize =
parameters.getParameter(LiveLinkParameters.cacheLRUSize);
+ if (cacheLRUsize == null)
+ cacheLRUsize = "1000";
+
org.apache.manifoldcf.crawler.connectors.livelink.MatchMap matchMap = null;
String usernameRegexp =
parameters.getParameter(org.apache.manifoldcf.crawler.connectors.livelink.LiveLinkParameters.userNameRegexp);
String livelinkUserExpr =
parameters.getParameter(org.apache.manifoldcf.crawler.connectors.livelink.LiveLinkParameters.livelinkNameSpec);
@@ -622,6 +690,33 @@ public class LivelinkAuthority extends o
"<input type=\"hidden\" name=\"livelinkuserexpr\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(livelinkUserExpr)+"\"/>\n"
);
}
+
+ // "Cache" tab
+ if(tabName.equals(Messages.getString(locale,"LivelinkConnector.Cache")))
+ {
+ out.print(
+"<table class=\"displaytable\">\n"+
+" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"LivelinkConnector.CacheLifetime") +
"</nobr></td>\n"+
+" <td class=\"value\"><input type=\"text\" size=\"5\"
name=\"cachelifetime\" value=\"" +
org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime) + "\"/> "
+ Messages.getBodyString(locale,"LivelinkConnector.minutes") + "</td>\n"+
+" </tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"LivelinkConnector.CacheLRUSize") +
"</nobr></td>\n"+
+" <td class=\"value\"><input type=\"text\" size=\"5\" name=\"cachelrusize\"
value=\"" + org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLRUsize)
+ "\"/></td>\n"+
+" </tr>\n"+
+"</table>\n"
+ );
+ }
+ else
+ {
+ // Hiddens for "Cache" tab
+ out.print(
+"<input type=\"hidden\" name=\"cachelifetime\" value=\"" +
org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime) + "\"/>\n"+
+"<input type=\"hidden\" name=\"cachelrusize\" value=\"" +
org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLRUsize) + "\"/>\n"
+ );
+ }
+
}
/** Process a configuration post.
@@ -661,6 +756,15 @@ public class LivelinkAuthority extends o
matchMap.appendMatchPair(usernameRegexp,livelinkUserExpr);
parameters.setParameter(org.apache.manifoldcf.crawler.connectors.livelink.LiveLinkParameters.userNameMapping,matchMap.toString());
}
+
+ String cacheLifetime = variableContext.getParameter("cachelifetime");
+ if (cacheLifetime != null)
+ parameters.setParameter(LiveLinkParameters.cacheLifetime,cacheLifetime);
+
+ String cacheLRUsize = variableContext.getParameter("cachelrusize");
+ if (cacheLRUsize != null)
+ parameters.setParameter(LiveLinkParameters.cacheLRUSize,cacheLRUsize);
+
return null;
}
@@ -801,8 +905,6 @@ public class LivelinkAuthority extends o
}
- protected static long responseLifetime = 60000L;
- protected static int LRUsize = 1000;
protected static StringSet emptyStringSet = new StringSet();
/** This is the cache object descriptor for cached access tokens from
@@ -819,12 +921,14 @@ public class LivelinkAuthority extends o
protected String serverUsername;
protected String serverPassword;
+ protected long responseLifetime;
+
/** The expiration time */
protected long expirationTime = -1;
/** Constructor. */
public AuthorizationResponseDescription(String userName, String
serverName, int serverPort,
- String serverUsername, String serverPassword)
+ String serverUsername, String serverPassword, long responseLifetime, int
LRUsize)
{
super("LiveLinkAuthority",LRUsize);
this.userName = userName;
@@ -832,6 +936,7 @@ public class LivelinkAuthority extends o
this.serverPort = serverPort;
this.serverUsername = serverUsername;
this.serverPassword = serverPassword;
+ this.responseLifetime = responseLifetime;
}
/** Return the invalidation keys for this object. */
Modified:
manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties
(original)
+++
manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties
Sun Jul 22 01:30:02 2012
@@ -15,6 +15,10 @@
LivelinkConnector.NoAccessTokensPresent=No access tokens present
LivelinkConnector.NoAccessTokensSpecified=No access tokens specified
+LivelinkConnector.Cache=Cache
+LivelinkConnector.CacheLifetime=Cache lifetime:
+LivelinkConnector.CacheLRUSize=Cache LRU size:
+LivelinkConnector.minutes=minutes
LivelinkConnector.Server=Server
LivelinkConnector.DocumentAccess=Document Access
LivelinkConnector.DocumentView=Document View
@@ -122,4 +126,8 @@ LivelinkConnector.PathNameMetadataAttrib
LivelinkConnector.NoPathNameMetadataAttributeSpecified=No path-name metadata
attribute specified
LivelinkConnector.PathValueMapping=Path-value mapping:
LivelinkConnector.NoMappingsSpecified=No mappings specified
+LivelinkConnector.CacheLifetimeCannotBeNull=Cache lifetime cannot be null
+LivelinkConnector.CacheLifetimeMustBeAnInteger=Cache lifetime must be an
integer
+LivelinkConnector.CacheLRUSizeCannotBeNull=Cache LRU size cannot be null
+LivelinkConnector.CacheLRUSizeMustBeAnInteger=Cache LRU size must be an integer
Modified:
manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties
(original)
+++
manifoldcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties
Sun Jul 22 01:30:02 2012
@@ -15,6 +15,10 @@
LivelinkConnector.NoAccessTokensPresent=ã¢ã¯ã»ã¹ãã¼ã¯ã³ãåå¨ãã¾ãã
LivelinkConnector.NoAccessTokensSpecified=ã¢ã¯ã»ã¹ãã¼ã¯ã³ãæªå®ç¾©ã§ã
+Livelink.Cache=ãã£ãã·ã¥
+Livelink.CacheLifetime=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ï¼
+Livelink.CacheLRUSize=ãã£ãã·ã¥LRUãµã¤ãºï¼
+Livelink.minutes=å
LivelinkConnector.Server=ãµã¼ã
LivelinkConnector.DocumentAccess=ããã¥ã¡ã³ãã¢ã¯ã»ã¹
LivelinkConnector.DocumentView=ããã¥ã¡ã³ã表示
@@ -121,3 +125,7 @@ LivelinkConnector.PathNameMetadataAttrib
LivelinkConnector.NoPathNameMetadataAttributeSpecified=path-nameã¡ã¿ãã¼ã¿å±æ§ã¯æå®ããã¦ãã¾ãã
LivelinkConnector.PathValueMapping=Path-valueãããï¼
LivelinkConnector.NoMappingsSpecified=ããããæå®ããã¦ãã¾ãã
+LivelinkConnector.CacheLifetimeCannotBeNull=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ãå
¥åãã¦ãã ãã
+LivelinkConnector.CacheLifetimeMustBeAnInteger=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
+LivelinkConnector.CacheLRUSizeCannotBeNull=ãã£ãã·ã¥LRUãµã¤ãºãå
¥åãã¦ãã ãã
+LivelinkConnector.CacheLRUSizeMustBeAnInteger=ãã£ãã·ã¥LRUãµã¤ãºã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
Modified:
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
(original)
+++
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
Sun Jul 22 01:30:02 2012
@@ -67,6 +67,11 @@ public class MeridioAuthority extends or
private String UserName = null;
private String Password = null;
+ private String cacheLifetime = null;
+ private String cacheLRUsize = null;
+ private long responseLifetime = 60000L;
+ private int LRUsize = 1000;
+
/** Cache manager. */
protected ICacheManager cacheManager = null;
@@ -125,12 +130,29 @@ public class MeridioAuthority extends or
UserName = configParams.getParameter("UserName");
Password = configParams.getObfuscatedParameter("Password");
+ cacheLifetime = configParams.getParameter("CacheLifetimeMins");
+ if (cacheLifetime == null)
+ cacheLifetime = "1";
+ cacheLRUsize = configParams.getParameter("CacheLRUSize");
+ if (cacheLRUsize == null)
+ cacheLRUsize = "1000";
+
}
/** Set up connection before attempting to use it */
protected void attemptToConnect()
throws ManifoldCFException
{
+ try
+ {
+ responseLifetime = Long.parseLong(this.cacheLifetime) * 60L * 1000L;
+ LRUsize = Integer.parseInt(this.cacheLRUsize);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new ManifoldCFException("Cache lifetime or Cache LRU size must be
an integer: "+e.getMessage(),e);
+ }
+
if (meridio_ == null)
{
@@ -437,6 +459,8 @@ public class MeridioAuthority extends or
MetaCartaWSProxyPort = null;
UserName = null;
Password = null;
+ cacheLifetime = null;
+ cacheLRUsize = null;
}
Logging.authorityConnectors.debug("Meridio: Exiting 'disconnect' method");
}
@@ -455,7 +479,8 @@ public class MeridioAuthority extends or
ICacheDescription objectDescription = new
AuthorizationResponseDescription(userName,
DmwsURL.toString(),RmwsURL.toString(),MetaCartawsURL.toString(),
DMWSProxyHost,DMWSProxyPort,RMWSProxyHost,RMWSProxyPort,
- MetaCartaWSProxyHost,MetaCartaWSProxyPort,this.UserName,this.Password);
+ MetaCartaWSProxyHost,MetaCartaWSProxyPort,this.UserName,this.Password,
+ responseLifetime,LRUsize);
// Enter the cache
ICacheHandle ch = cacheManager.enterCache(new
ICacheDescription[]{objectDescription},null,null);
@@ -678,6 +703,7 @@ public class MeridioAuthority extends or
tabsArray.add(Messages.getString(locale,"MeridioConnector.RecordsServer"));
tabsArray.add(Messages.getString(locale,"MeridioConnector.UserServiceServer"));
tabsArray.add(Messages.getString(locale,"MeridioConnector.Credentials"));
+ tabsArray.add(Messages.getString(locale,"MeridioConnector.Cache"));
out.print(
"<script type=\"text/javascript\">\n"+
"<!--\n"+
@@ -782,6 +808,34 @@ public class MeridioAuthority extends or
" editconnection.userName.focus();\n"+
" return false;\n"+
" }\n"+
+" if (editconnection.cachelifetime.value == \"\")\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"MeridioConnector.CacheLifetimeCannotBeNull")
+ "\");\n"+
+" SelectTab(\"" +
Messages.getBodyJavascriptString(locale,"MeridioConnector.Cache") + "\");\n"+
+" editconnection.cachelifetime.focus();\n"+
+" return false;\n"+
+" }\n"+
+" if (editconnection.cachelifetime.value != \"\" &&
!isInteger(editconnection.cachelifetime.value))\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"MeridioConnector.CacheLifetimeMustBeAnInteger")
+ "\");\n"+
+" SelectTab(\"" +
Messages.getBodyJavascriptString(locale,"MeridioConnector.Cache") + "\");\n"+
+" editconnection.cachelifetime.focus();\n"+
+" return false;\n"+
+" }\n"+
+" if (editconnection.cachelrusize.value == \"\")\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"MeridioConnector.CacheLRUSizeCannotBeNull")
+ "\");\n"+
+" SelectTab(\"" +
Messages.getBodyJavascriptString(locale,"MeridioConnector.Cache") + "\");\n"+
+" editconnection.cachelrusize.focus();\n"+
+" return false;\n"+
+" }\n"+
+" if (editconnection.cachelrusize.value != \"\" &&
!isInteger(editconnection.cachelrusize.value))\n"+
+" {\n"+
+" alert(\"" +
Messages.getBodyJavascriptString(locale,"MeridioConnector.CacheLRUSizeMustBeAnInteger")
+ "\");\n"+
+" SelectTab(\"" +
Messages.getBodyJavascriptString(locale,"MeridioConnector.Cache") + "\");\n"+
+" editconnection.cachelrusize.focus();\n"+
+" return false;\n"+
+" }\n"+
"\n"+
" return true;\n"+
"}\n"+
@@ -901,6 +955,14 @@ public class MeridioAuthority extends or
else
localKeystore = KeystoreManagerFactory.make("",meridioKeystore);
+ String cacheLifetime = parameters.getParameter("CacheLifetimeMins");
+ if (cacheLifetime == null)
+ cacheLifetime = "1";
+
+ String cacheLRUsize = parameters.getParameter("CacheLRUSize");
+ if (cacheLRUsize == null)
+ cacheLRUsize = "1000";
+
out.print(
"<input name=\"configop\" type=\"hidden\" value=\"Continue\"/>\n"
);
@@ -1104,6 +1166,33 @@ public class MeridioAuthority extends or
"<input type=\"hidden\" name=\"password\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(password)+"\"/>\n"
);
}
+
+ // "Cache" tab
+ if(tabName.equals(Messages.getString(locale,"MeridioConnector.Cache")))
+ {
+ out.print(
+"<table class=\"displaytable\">\n"+
+" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"MeridioConnector.CacheLifetime") +
"</nobr></td>\n"+
+" <td class=\"value\"><input type=\"text\" size=\"5\"
name=\"cachelifetime\" value=\"" +
org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime) + "\"/> "
+ Messages.getBodyString(locale,"MeridioConnector.minutes") + "</td>\n"+
+" </tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"MeridioConnector.CacheLRUSize") +
"</nobr></td>\n"+
+" <td class=\"value\"><input type=\"text\" size=\"5\" name=\"cachelrusize\"
value=\"" + org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLRUsize)
+ "\"/></td>\n"+
+" </tr>\n"+
+"</table>\n"
+ );
+ }
+ else
+ {
+ // Hiddens for "Cache" tab
+ out.print(
+"<input type=\"hidden\" name=\"cachelifetime\" value=\"" +
org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime) + "\"/>\n"+
+"<input type=\"hidden\" name=\"cachelrusize\" value=\"" +
org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLRUsize) + "\"/>\n"
+ );
+ }
+
}
/** Process a configuration post.
@@ -1259,6 +1348,15 @@ public class MeridioAuthority extends or
parameters.setParameter("MeridioKeystore",mgr.getString());
}
}
+
+ String cacheLifetime = variableContext.getParameter("cachelifetime");
+ if (cacheLifetime != null)
+ parameters.setParameter("CacheLifetimeMins",cacheLifetime);
+
+ String cacheLRUsize = variableContext.getParameter("cachelrusize");
+ if (cacheLRUsize != null)
+ parameters.setParameter("CacheLRUSize",cacheLRUsize);
+
return null;
}
@@ -1312,8 +1410,6 @@ public class MeridioAuthority extends or
);
}
- protected static long responseLifetime = 60000L;
- protected static int LRUsize = 1000;
protected static StringSet emptyStringSet = new StringSet();
/** This is the cache object descriptor for cached access tokens from
@@ -1337,13 +1433,16 @@ public class MeridioAuthority extends or
protected String adminUserName;
protected String adminPassword;
+ protected long responseLifetime;
+
/** The expiration time */
protected long expirationTime = -1;
/** Constructor. */
public AuthorizationResponseDescription(String userName, String DmwsURL,
String RmwsURL, String wsURL,
String DMWSProxyHost, String DMWSProxyPort, String RMWSProxyHost, String
RMWSProxyPort,
- String wsProxyHost, String wsProxyPort, String adminUserName, String
adminPassword)
+ String wsProxyHost, String wsProxyPort, String adminUserName, String
adminPassword,
+ long responseLifetime, int LRUsize)
{
super("MeridioAuthority",LRUsize);
this.userName = userName;
@@ -1358,6 +1457,7 @@ public class MeridioAuthority extends or
this.wsProxyPort = wsProxyPort;
this.adminUserName = adminUserName;
this.adminPassword = adminPassword;
+ this.responseLifetime = responseLifetime;
}
/** Return the invalidation keys for this object. */
Modified:
manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_en_US.properties?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_en_US.properties
(original)
+++
manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_en_US.properties
Sun Jul 22 01:30:02 2012
@@ -15,6 +15,10 @@
MeridioConnector.NoAccessTokensPresent=No access tokens present
MeridioConnector.NoAccessTokensSpecified=No access tokens specified
+MeridioConnector.Cache=Cache
+MeridioConnector.CacheLifetime=Cache lifetime:
+MeridioConnector.CacheLRUSize=Cache LRU size:
+MeridioConnector.minutes=minutes
MeridioConnector.DocumentServer=Document Server
MeridioConnector.RecordsServer=Records Server
MeridioConnector.UserServiceServer=User Service Server
@@ -112,4 +116,8 @@ MeridioConnector.NoMetadataPropertiesToI
MeridioConnector.PathNameMetadataAttribute=Path-name metadata attribute:
MeridioConnector.NoPathNameMetadataAttributeSpecified=No path-name metadata
attribute specified
MeridioConnector.PathValueMapping=Path-value mapping:
+MeridioConnector.CacheLifetimeCannotBeNull=Cache lifetime cannot be null
+MeridioConnector.CacheLifetimeMustBeAnInteger=Cache lifetime must be an integer
+MeridioConnector.CacheLRUSizeCannotBeNull=Cache LRU size cannot be null
+MeridioConnector.CacheLRUSizeMustBeAnInteger=Cache LRU size must be an integer
Modified:
manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_ja_JP.properties?rev=1364205&r1=1364204&r2=1364205&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_ja_JP.properties
(original)
+++
manifoldcf/trunk/connectors/meridio/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/meridio/common_ja_JP.properties
Sun Jul 22 01:30:02 2012
@@ -15,6 +15,10 @@
MeridioConnector.NoAccessTokensPresent=ã¢ã¯ã»ã¹ãã¼ã¯ã³ãåå¨ãã¾ãã
MeridioConnector.NoAccessTokensSpecified=ã¢ã¯ã»ã¹ãã¼ã¯ã³ãæªå®ç¾©ã§ã
+MeridioConnector.Cache=ãã£ãã·ã¥
+MeridioConnector.CacheLifetime=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ï¼
+MeridioConnector.CacheLRUSize=ãã£ãã·ã¥LRUãµã¤ãºï¼
+MeridioConnector.minutes=å
MeridioConnector.DocumentServer=ããã¥ã¡ã³ããµã¼ã
MeridioConnector.RecordsServer=ã¬ã³ã¼ããµã¼ã
MeridioConnector.UserServiceServer=ã¦ã¼ã¶ãµã¼ãã¹ãµã¼ã
@@ -112,4 +116,8 @@ MeridioConnector.NoMetadataPropertiesToI
MeridioConnector.PathNameMetadataAttribute=Path-nameã¡ã¿ãã¼ã¿å±æ§ï¼
MeridioConnector.NoPathNameMetadataAttributeSpecified=path-nameã¡ã¿ãã¼ã¿å±æ§ãæå®ããã¦ãã¾ãã
MeridioConnector.PathValueMapping=Path-valueãããï¼
+MeridioConnector.CacheLifetimeCannotBeNull=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ãå
¥åãã¦ãã ãã
+MeridioConnector.CacheLifetimeMustBeAnInteger=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
+MeridioConnector.CacheLRUSizeCannotBeNull=ãã£ãã·ã¥LRUãµã¤ãºãå
¥åãã¦ãã ãã
+MeridioConnector.CacheLRUSizeMustBeAnInteger=ãã£ãã·ã¥LRUãµã¤ãºã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
