WebAuthenticationForm.java

src/main/java/org/codelibs/fess/crud/form/admin/BsWebAuthenticationForm.java

@@ -1,118 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed 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.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsWebAuthenticationForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Maxbytelength(maxbytelength = 100)
-    public String hostname;
-
-    @IntRange(min = -1, max = 2147483647)
-    public String port;
-
-    @Maxbytelength(maxbytelength = 100)
-    public String authRealm;
-
-    @Maxbytelength(maxbytelength = 10)
-    public String protocolScheme;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String username;
-
-    @Maxbytelength(maxbytelength = 100)
-    public String password;
-
-    @Maxbytelength(maxbytelength = 1000)
-    public String parameters;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @LongType
-    public String webCrawlingConfigId;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        hostname = null;
-        port = null;
-        authRealm = null;
-        protocolScheme = null;
-        username = null;
-        password = null;
-        parameters = null;
-        webCrawlingConfigId = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

src/main/java/org/codelibs/fess/web/admin/WebAuthenticationForm.java

@@ -19,17 +19,104 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsWebAuthenticationForm;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class WebAuthenticationForm extends BsWebAuthenticationForm implements Serializable {
+public class WebAuthenticationForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Maxbytelength(maxbytelength = 100)
+    public String hostname;
+
+    @IntRange(min = -1, max = 2147483647)
+    public String port;
+
+    @Maxbytelength(maxbytelength = 100)
+    public String authRealm;
+
+    @Maxbytelength(maxbytelength = 10)
+    public String protocolScheme;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String username;
+
+    @Maxbytelength(maxbytelength = 100)
+    public String password;
+
+    @Maxbytelength(maxbytelength = 1000)
+    public String parameters;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @LongType
+    public String webCrawlingConfigId;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        hostname = null;
+        port = null;
+        authRealm = null;
+        protocolScheme = null;
+        username = null;
+        password = null;
+        parameters = null;
+        webCrawlingConfigId = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         createdBy = "system";
         final SimpleDateFormat sdf = new SimpleDateFormat(Constants.DEFAULT_DATETIME_FORMAT);
         createdTime = sdf.format(new Date());