Browse Source

update by freegen

Shinsuke Sugaya 9 years ago
parent
commit
1c15ec0d76

+ 2 - 2
src/main/java/org/codelibs/fess/api/json/JsonApiManager.java

@@ -705,8 +705,8 @@ public class JsonApiManager extends BaseApiManager {
             for (Map.Entry<String, String[]> entry : request.getParameterMap().entrySet()) {
                 String key = entry.getKey();
                 if (key.startsWith("fields.")) {
-                    String[] value = StreamUtil.of(entry.getValue()).filter(q -> StringUtil.isNotBlank(q)).distinct()
-                    .toArray(n -> new String[n]);
+                    String[] value =
+                            StreamUtil.of(entry.getValue()).filter(q -> StringUtil.isNotBlank(q)).distinct().toArray(n -> new String[n]);
                     fields.put(key.substring("fields.".length()), value);
                 }
             }

+ 204 - 0
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -2082,6 +2082,210 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Last Name */
     public static final String LABELS_SURAME = "{labels.surame}";
 
+    /** The key of the message: E-mail */
+    public static final String LABELS_user_mail = "{labels.user_mail}";
+
+    /** The key of the message: E-mail */
+    public static final String LABELS_MAIL = "{labels.mail}";
+
+    /** The key of the message: employeeNumber */
+    public static final String LABELS_user_employeeNumber = "{labels.user_employeeNumber}";
+
+    /** The key of the message: employeeNumber */
+    public static final String LABELS_EMPLOYEE_NUMBER = "{labels.employeeNumber}";
+
+    /** The key of the message: telephoneNumber */
+    public static final String LABELS_user_telephoneNumber = "{labels.user_telephoneNumber}";
+
+    /** The key of the message: telephoneNumber */
+    public static final String LABELS_TELEPHONE_NUMBER = "{labels.telephoneNumber}";
+
+    /** The key of the message: homePhone */
+    public static final String LABELS_user_homePhone = "{labels.user_homePhone}";
+
+    /** The key of the message: homePhone */
+    public static final String LABELS_HOME_PHONE = "{labels.homePhone}";
+
+    /** The key of the message: homePostalAddress */
+    public static final String LABELS_user_homePostalAddress = "{labels.user_homePostalAddress}";
+
+    /** The key of the message: homePostalAddress */
+    public static final String LABELS_HOME_POSTAL_ADDRESS = "{labels.homePostalAddress}";
+
+    /** The key of the message: labeledURI */
+    public static final String LABELS_user_labeledURI = "{labels.user_labeledURI}";
+
+    /** The key of the message: labeledURI */
+    public static final String LABELS_LABELEDURI = "{labels.labeledURI}";
+
+    /** The key of the message: roomNumber */
+    public static final String LABELS_user_roomNumber = "{labels.user_roomNumber}";
+
+    /** The key of the message: roomNumber */
+    public static final String LABELS_ROOM_NUMBER = "{labels.roomNumber}";
+
+    /** The key of the message: description */
+    public static final String LABELS_user_description = "{labels.user_description}";
+
+    /** The key of the message: description */
+    public static final String LABELS_DESCRIPTION = "{labels.description}";
+
+    /** The key of the message: title */
+    public static final String LABELS_user_title = "{labels.user_title}";
+
+    /** The key of the message: title */
+    public static final String LABELS_TITLE = "{labels.title}";
+
+    /** The key of the message: pager */
+    public static final String LABELS_user_pager = "{labels.user_pager}";
+
+    /** The key of the message: pager */
+    public static final String LABELS_PAGER = "{labels.pager}";
+
+    /** The key of the message: street */
+    public static final String LABELS_user_street = "{labels.user_street}";
+
+    /** The key of the message: street */
+    public static final String LABELS_STREET = "{labels.street}";
+
+    /** The key of the message: postalCode */
+    public static final String LABELS_user_postalCode = "{labels.user_postalCode}";
+
+    /** The key of the message: postalCode */
+    public static final String LABELS_POSTAL_CODE = "{labels.postalCode}";
+
+    /** The key of the message: physicalDeliveryOfficeName */
+    public static final String LABELS_user_physicalDeliveryOfficeName = "{labels.user_physicalDeliveryOfficeName}";
+
+    /** The key of the message: physicalDeliveryOfficeName */
+    public static final String LABELS_PHYSICAL_DELIVERY_OFFICE_NAME = "{labels.physicalDeliveryOfficeName}";
+
+    /** The key of the message: destinationIndicator */
+    public static final String LABELS_user_destinationIndicator = "{labels.user_destinationIndicator}";
+
+    /** The key of the message: destinationIndicator */
+    public static final String LABELS_DESTINATION_INDICATOR = "{labels.destinationIndicator}";
+
+    /** The key of the message: internationaliSDNNumber */
+    public static final String LABELS_user_internationaliSDNNumber = "{labels.user_internationaliSDNNumber}";
+
+    /** The key of the message: internationaliSDNNumber */
+    public static final String LABELS_INTERNATIONALISDN_NUMBER = "{labels.internationaliSDNNumber}";
+
+    /** The key of the message: state */
+    public static final String LABELS_user_state = "{labels.user_state}";
+
+    /** The key of the message: state */
+    public static final String LABELS_STATE = "{labels.state}";
+
+    /** The key of the message: employeeType */
+    public static final String LABELS_user_employeeType = "{labels.user_employeeType}";
+
+    /** The key of the message: employeeType */
+    public static final String LABELS_EMPLOYEE_TYPE = "{labels.employeeType}";
+
+    /** The key of the message: facsimileTelephoneNumber */
+    public static final String LABELS_user_facsimileTelephoneNumber = "{labels.user_facsimileTelephoneNumber}";
+
+    /** The key of the message: facsimileTelephoneNumber */
+    public static final String LABELS_FACSIMILE_TELEPHONE_NUMBER = "{labels.facsimileTelephoneNumber}";
+
+    /** The key of the message: postOfficeBox */
+    public static final String LABELS_user_postOfficeBox = "{labels.user_postOfficeBox}";
+
+    /** The key of the message: postOfficeBox */
+    public static final String LABELS_POST_OFFICE_BOX = "{labels.postOfficeBox}";
+
+    /** The key of the message: initials */
+    public static final String LABELS_user_initials = "{labels.user_initials}";
+
+    /** The key of the message: initials */
+    public static final String LABELS_INITIALS = "{labels.initials}";
+
+    /** The key of the message: carLicense */
+    public static final String LABELS_user_carLicense = "{labels.user_carLicense}";
+
+    /** The key of the message: carLicense */
+    public static final String LABELS_CAR_LICENSE = "{labels.carLicense}";
+
+    /** The key of the message: mobile */
+    public static final String LABELS_user_mobile = "{labels.user_mobile}";
+
+    /** The key of the message: mobile */
+    public static final String LABELS_MOBILE = "{labels.mobile}";
+
+    /** The key of the message: postalAddress */
+    public static final String LABELS_user_postalAddress = "{labels.user_postalAddress}";
+
+    /** The key of the message: postalAddress */
+    public static final String LABELS_POSTAL_ADDRESS = "{labels.postalAddress}";
+
+    /** The key of the message: city */
+    public static final String LABELS_user_city = "{labels.user_city}";
+
+    /** The key of the message: city */
+    public static final String LABELS_CITY = "{labels.city}";
+
+    /** The key of the message: teletexTerminalIdentifier */
+    public static final String LABELS_user_teletexTerminalIdentifier = "{labels.user_teletexTerminalIdentifier}";
+
+    /** The key of the message: teletexTerminalIdentifier */
+    public static final String LABELS_TELETEX_TERMINAL_IDENTIFIER = "{labels.teletexTerminalIdentifier}";
+
+    /** The key of the message: x121Address */
+    public static final String LABELS_user_x121Address = "{labels.user_x121Address}";
+
+    /** The key of the message: x121Address */
+    public static final String LABELS_X121_ADDRESS = "{labels.x121Address}";
+
+    /** The key of the message: businessCategory */
+    public static final String LABELS_user_businessCategory = "{labels.user_businessCategory}";
+
+    /** The key of the message: businessCategory */
+    public static final String LABELS_BUSINESS_CATEGORY = "{labels.businessCategory}";
+
+    /** The key of the message: registeredAddress */
+    public static final String LABELS_user_registeredAddress = "{labels.user_registeredAddress}";
+
+    /** The key of the message: registeredAddress */
+    public static final String LABELS_REGISTERED_ADDRESS = "{labels.registeredAddress}";
+
+    /** The key of the message: displayName */
+    public static final String LABELS_user_displayName = "{labels.user_displayName}";
+
+    /** The key of the message: displayName */
+    public static final String LABELS_DISPLAY_NAME = "{labels.displayName}";
+
+    /** The key of the message: preferredLanguage */
+    public static final String LABELS_user_preferredLanguage = "{labels.user_preferredLanguage}";
+
+    /** The key of the message: preferredLanguage */
+    public static final String LABELS_PREFERRED_LANGUAGE = "{labels.preferredLanguage}";
+
+    /** The key of the message: departmentNumber */
+    public static final String LABELS_user_departmentNumber = "{labels.user_departmentNumber}";
+
+    /** The key of the message: departmentNumber */
+    public static final String LABELS_DEPARTMENT_NUMBER = "{labels.departmentNumber}";
+
+    /** The key of the message: uidNumber */
+    public static final String LABELS_user_uidNumber = "{labels.user_uidNumber}";
+
+    /** The key of the message: uidNumber */
+    public static final String LABELS_UID_NUMBER = "{labels.uidNumber}";
+
+    /** The key of the message: gidNumber */
+    public static final String LABELS_user_gidNumber = "{labels.user_gidNumber}";
+
+    /** The key of the message: gidNumber */
+    public static final String LABELS_GID_NUMBER = "{labels.gidNumber}";
+
+    /** The key of the message: homeDirectory */
+    public static final String LABELS_user_homeDirectory = "{labels.user_homeDirectory}";
+
+    /** The key of the message: homeDirectory */
+    public static final String LABELS_HOME_DIRECTORY = "{labels.homeDirectory}";
+
     /**
      * Assert the property is not null.
      * @param property The value of the property. (NotNull)

+ 10 - 2
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java

@@ -51,9 +51,11 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+UseParNewGC
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
+    -XX:-OmitStackTraceInFastThrow
     -Djcifs.smb.client.connTimeout=60000
     -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.responseTimeout=30000
+    -Dgroovy.use.classvalue=true
     */
     String JVM_CRAWLER_OPTIONS = "jvm.crawler.options";
 
@@ -67,7 +69,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:CMSInitiatingOccupancyFraction=75
     -XX:+UseParNewGC
     -XX:+UseTLAB
-    -XX:+DisableExplicitGC */
+    -XX:+DisableExplicitGC
+    -Dgroovy.use.classvalue=true
+    */
     String JVM_SUGGEST_OPTIONS = "jvm.suggest.options";
 
     /** The key of the configuration. e.g. default_crawler */
@@ -956,9 +960,11 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+UseParNewGC
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
+    -XX:-OmitStackTraceInFastThrow
     -Djcifs.smb.client.connTimeout=60000
     -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.responseTimeout=30000
+    -Dgroovy.use.classvalue=true
     <br>
      * comment: JVM options
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
@@ -977,7 +983,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:CMSInitiatingOccupancyFraction=75
     -XX:+UseParNewGC
     -XX:+UseTLAB
-    -XX:+DisableExplicitGC <br>
+    -XX:+DisableExplicitGC
+    -Dgroovy.use.classvalue=true
+    <br>
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      */
     String getJvmSuggestOptions();

+ 0 - 1
src/main/java/org/codelibs/fess/taglib/FessFunctions.java

@@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.core.misc.Base64Util;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.FacetQueryView;
 import org.codelibs.fess.helper.ViewHelper;

+ 1 - 1
src/main/resources/fess_config.properties

@@ -48,7 +48,7 @@ jvm.suggest.options=\
 -XX:CMSInitiatingOccupancyFraction=75\n\
 -XX:+UseParNewGC\n\
 -XX:+UseTLAB\n\
--XX:+DisableExplicitGC
+-XX:+DisableExplicitGC\n\
 -Dgroovy.use.classvalue=true\n\