diff --git a/src/main/java/org/codelibs/fess/app/web/annotation/Secured.java b/src/main/java/org/codelibs/fess/annotation/Secured.java similarity index 97% rename from src/main/java/org/codelibs/fess/app/web/annotation/Secured.java rename to src/main/java/org/codelibs/fess/annotation/Secured.java index 7e4e8c7e81b17e032c5a1283edcbafff8f364a78..f77baed45f438262d10c0f480285a2c67f1945f1 100644 --- a/src/main/java/org/codelibs/fess/app/web/annotation/Secured.java +++ b/src/main/java/org/codelibs/fess/annotation/Secured.java @@ -13,7 +13,7 @@ * either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.codelibs.fess.app.web.annotation; +package org.codelibs.fess.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java b/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java index 4b6b7f24eed89c56920f471546696dcf0f6fd52b..35772641ae1b83cb2f68b6000f5fcf3f4ac7cf52 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java @@ -15,6 +15,7 @@ */ package org.codelibs.fess.app.web.admin; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.admin.accesstoken.AdminAccesstokenAction; import org.codelibs.fess.app.web.admin.backup.AdminBackupAction; import org.codelibs.fess.app.web.admin.badword.AdminBadwordAction; @@ -52,7 +53,6 @@ import org.codelibs.fess.app.web.admin.user.AdminUserAction; import org.codelibs.fess.app.web.admin.webauth.AdminWebauthAction; import org.codelibs.fess.app.web.admin.webconfig.AdminWebconfigAction; import org.codelibs.fess.app.web.admin.wizard.AdminWizardAction; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.mylasta.action.FessUserBean; import org.lastaflute.web.Execute; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java index 8b9199d85d54156a1d19337087104aabc232b697..1d116a85dad5d9b5cd3951b6c8a9e43ee752c2b6 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java @@ -25,10 +25,10 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.AccessTokenPager; import org.codelibs.fess.app.service.AccessTokenService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.AccessToken; import org.codelibs.fess.helper.PermissionHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java index 0d6d4a8528aba6a16ce0f05fd3d7163f135e6cf3..a13fff50058a09e73d6df796e078e019a30f3c13 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java @@ -53,7 +53,7 @@ import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.Pair; import org.codelibs.curl.CurlResponse; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exbhv.FileConfigBhv; import org.codelibs.fess.es.config.exbhv.LabelTypeBhv; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java index dab86e7142eb403b2bc5750d3b08898789085895..2f6284c9c56d1f2a415e11b3ecb49b1077fd1074 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java @@ -30,10 +30,10 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.BadWordPager; import org.codelibs.fess.app.service.BadWordService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.BadWord; import org.codelibs.fess.exception.FessSystemException; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java index 9d030f1f86d8bd6bba35f0afdbb07df47be66a26..e300c8366b611b160417f5e9afa992ee1d16c430 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java @@ -19,10 +19,10 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.BoostDocPager; import org.codelibs.fess.app.service.BoostDocumentRuleService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.BoostDocumentRule; import org.codelibs.fess.helper.SystemHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java index 5d2dbc180d94b543abcc65b5463fa1a3c45cbb4c..a1a264077557c90b5bbfd80bed46265817baf638 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java @@ -20,10 +20,10 @@ import javax.annotation.Resource; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.CrawlingInfoPager; import org.codelibs.fess.app.service.CrawlingInfoService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.helper.ProcessHelper; import org.codelibs.fess.util.RenderDataUtil; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java index c3daad82073ae633e68ebf7ba254ccd55aa10d68..cba435c623ad81e639ca5845dbacb43c5db14304 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java @@ -17,8 +17,8 @@ package org.codelibs.fess.app.web.admin.dashboard; import javax.annotation.Resource; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.api.es.EsApiManager; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.util.RenderDataUtil; import org.lastaflute.web.Execute; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java index ea5269f79304040d842adc0dac2af01f5a78914b..5afb5107239425a9822e2cfe9fdfd52ecd1ffeb8 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java @@ -29,11 +29,11 @@ import javax.annotation.Resource; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.DataConfigPager; import org.codelibs.fess.app.service.DataConfigService; import org.codelibs.fess.app.service.RoleTypeService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.ds.DataStoreFactory; import org.codelibs.fess.es.config.exentity.DataConfig; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index a20f1cdf328a84c8fa9a89f145b83af75a89577e..5bc098e070138185d1c7c44cc772a986b8f5e80f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -31,7 +31,7 @@ import org.codelibs.core.io.ResourceUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.Pair; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.exception.FessSystemException; import org.codelibs.fess.util.ComponentUtil; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java index 1fcc681d3d839c18f54162ef9f588d46cbb2c0b3..82553354161aeae14a2162caef77262a5bda06dd 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java @@ -17,7 +17,7 @@ package org.codelibs.fess.app.web.admin.dict; import javax.annotation.Resource; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.dict.DictionaryFile; import org.codelibs.fess.dict.DictionaryItem; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java index 0b223e1142290534610b5a6b2263a6ee3f65243f..4a7f9281f14c5a6b0242bfc87db39b165ead968a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java @@ -24,11 +24,11 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.KuromojiPager; import org.codelibs.fess.app.service.KuromojiService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.admin.dict.AdminDictAction; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.app.web.base.FessBaseAction; import org.codelibs.fess.dict.kuromoji.KuromojiItem; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java index 039aa3388b3fdd82e8773cd48751172336726168..2c065af90779f3d2ae5c17bf24abc044cb266a78 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java @@ -26,11 +26,11 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.CharMappingPager; import org.codelibs.fess.app.service.CharMappingService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.admin.dict.AdminDictAction; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.app.web.base.FessBaseAction; import org.codelibs.fess.dict.mapping.CharMappingItem; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java index ccc97a931c13eaae2751dc58aac22f2efd8fdbce..46056c007d95dde4013e4162a1cbe8259e0efe25 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java @@ -24,11 +24,11 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.ProtwordsPager; import org.codelibs.fess.app.service.ProtwordsService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.admin.dict.AdminDictAction; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.app.web.base.FessBaseAction; import org.codelibs.fess.dict.protwords.ProtwordsItem; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java index 5ce0d44eba6aeb328aff86cc524934d264e40ace..64b1a39a450b6bc020e56f66093688b19c72a56b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java @@ -24,11 +24,11 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.StemmerOverridePager; import org.codelibs.fess.app.service.StemmerOverrideService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.admin.dict.AdminDictAction; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.app.web.base.FessBaseAction; import org.codelibs.fess.dict.stemmeroverride.StemmerOverrideItem; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java index 6fefcf6727c2dfc2dd4e317998b1ac82610a5f51..7ff9192a106a2040ae7bfa523614e54fea335b32 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java @@ -24,11 +24,11 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.StopwordsPager; import org.codelibs.fess.app.service.StopwordsService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.admin.dict.AdminDictAction; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.dict.stopwords.StopwordsItem; import org.codelibs.fess.util.ComponentUtil; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java index 180c21b1861c34de965ab438c655ebd2ff6de3c3..1e1728013f3bc15d3273a57dbdb2f5460accf4d7 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java @@ -26,11 +26,11 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.SynonymPager; import org.codelibs.fess.app.service.SynonymService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.admin.dict.AdminDictAction; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.app.web.base.FessBaseAction; import org.codelibs.fess.dict.synonym.SynonymItem; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java index 819d23742744c397c960fb3cb331b6b32a16bc6d..1e14c6e8ba7b98ca085bf706befbbe26ee41c2fd 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java @@ -18,10 +18,10 @@ package org.codelibs.fess.app.web.admin.duplicatehost; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.DuplicateHostPager; import org.codelibs.fess.app.service.DuplicateHostService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.DuplicateHost; import org.codelibs.fess.helper.SystemHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java index 0ee802a5145720eeb932a98d0e17ddcdfadb98d3..57c6a7cf6a497f1c5c8f8730f9da49284e518d89 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java @@ -36,11 +36,11 @@ import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.ElevateWordPager; import org.codelibs.fess.app.service.ElevateWordService; import org.codelibs.fess.app.service.LabelTypeService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.ElevateWord; import org.codelibs.fess.exception.FessSystemException; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java b/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java index 8ba314eb2f99ff46db5df35243bd61e7fc2ee2d2..98e9ce4cad1f29dc7e5b3604d92d7be950d38b73 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java @@ -30,7 +30,7 @@ import org.codelibs.core.lang.StringUtil; import org.codelibs.curl.CurlRequest; import org.codelibs.curl.CurlResponse; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.helper.CurlHelper; import org.codelibs.fess.util.ComponentUtil; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java index e60ec6e5d96ea0752d75e2f54a675ade571560b9..fc264d84b1b7a8735e2450e56d3347c581737966 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java @@ -18,10 +18,10 @@ package org.codelibs.fess.app.web.admin.failureurl; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.FailureUrlPager; import org.codelibs.fess.app.service.FailureUrlService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.util.RenderDataUtil; import org.lastaflute.web.Execute; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java index 503402b29864ffd4bd5231daa98e301dd2009080..6588f4d97adbb14ea6cc0c5348c694d3758a423c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java @@ -24,11 +24,11 @@ import java.util.Map; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.FileAuthPager; import org.codelibs.fess.app.service.FileAuthenticationService; import org.codelibs.fess.app.service.FileConfigService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.FileAuthentication; import org.codelibs.fess.es.config.exentity.FileConfig; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java index 6d61b5f4efe8f34b9867e14f142b305b5da1b13c..63ce394f256cd3a5fa8c4ce32af170a29e6e49f2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java @@ -25,12 +25,12 @@ import javax.annotation.Resource; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.FileConfigPager; import org.codelibs.fess.app.service.FileConfigService; import org.codelibs.fess.app.service.LabelTypeService; import org.codelibs.fess.app.service.RoleTypeService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.FileConfig; import org.codelibs.fess.helper.PermissionHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java index 1835ab1efcdfaefceb67c087b7f8bed7d65f35b4..6c53ed43dbab4f626fe48a2ab65680952e1dfab0 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java @@ -30,7 +30,7 @@ import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.mylasta.direction.FessConfig; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java index 80bb39297755b4996764d8e442b034a0342eafa9..deb0245e2834ab36f1ed5c138d0c4ce8f8f67982 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java @@ -22,10 +22,10 @@ import javax.annotation.Resource; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.GroupPager; import org.codelibs.fess.app.service.GroupService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.user.exentity.Group; import org.codelibs.fess.util.ComponentUtil; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java index 4a4a3557cca84af567cc837a8a1adf3d4a438541..80e51d7013ce824823075d9afd11db16e0a28d3b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java @@ -21,10 +21,10 @@ import java.util.List; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.JobLogPager; import org.codelibs.fess.app.service.JobLogService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.util.RenderDataUtil; import org.lastaflute.web.Execute; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java index 5a4c5b207fdbcd1138093e93b4e51ddee1e6ede1..a0a379c4f8ab0242271373a8eed5dd83e99f597c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java @@ -22,10 +22,10 @@ import java.util.Map; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.KeyMatchPager; import org.codelibs.fess.app.service.KeyMatchService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.KeyMatch; import org.codelibs.fess.helper.KeyMatchHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java index a095eba937fea73b529657c6520e1c5ef7e888f9..37e412265bdda239139a0b7a8b159b1b41c189d3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java @@ -25,11 +25,11 @@ import javax.annotation.Resource; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.LabelTypePager; import org.codelibs.fess.app.service.LabelTypeService; import org.codelibs.fess.app.service.RoleTypeService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.LabelType; import org.codelibs.fess.helper.PermissionHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java index dc25bee7d46469cbb1bedd1e005161138470a7dd..09fe2ca50dc539f5d16602072180b15d5e2a9106 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.stream.Stream; import org.codelibs.core.lang.StringUtil; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.exception.FessSystemException; import org.codelibs.fess.helper.SystemHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java index 924c811cd11b780a08e6d196394369049d8dd227..3e42e1c57ced495bf4d034dcb22ec3cdb22fd76e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java @@ -36,7 +36,7 @@ import org.codelibs.core.io.CopyUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.curl.CurlResponse; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.mylasta.direction.FessConfig.SimpleImpl; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java index 8cb08a3cf38e08a6219cfaadf7a1fa3bcfe889eb..58b66a3b890d3c36ab17ede22c523005ed7640bb 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java @@ -18,10 +18,10 @@ package org.codelibs.fess.app.web.admin.pathmap; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.PathMapPager; import org.codelibs.fess.app.service.PathMappingService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.PathMapping; import org.codelibs.fess.helper.SystemHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java b/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java index 4d06e62a8d1bf3a2942963a0117a96f566e488d3..ede4e3c5a1875f841f07925ed26fa02b9c5e6c50 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.io.CopyUtil; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.helper.PluginHelper; import org.codelibs.fess.helper.PluginHelper.Artifact; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java index f20630a576980727e6cac4aa0147f6be15496603..04b01423dc593c7536663283ff61329e275bde2c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java @@ -19,10 +19,10 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.RelatedContentPager; import org.codelibs.fess.app.service.RelatedContentService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.RelatedContent; import org.codelibs.fess.helper.SystemHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java index 1c863f013102373e69db3dda03ee37e906d5857d..a1cf552c754a116a3c575d6d68f507d184e1ed46 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java @@ -26,10 +26,10 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.RelatedQueryPager; import org.codelibs.fess.app.service.RelatedQueryService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.RelatedQuery; import org.codelibs.fess.helper.SystemHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java index ff6b08e38c0aff48c85a53fc4591d097696f956d..b23d1cce22016b5c9281a29769809bd328879e4b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java @@ -23,11 +23,11 @@ import java.util.Map; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.ReqHeaderPager; import org.codelibs.fess.app.service.RequestHeaderService; import org.codelibs.fess.app.service.WebConfigService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.RequestHeader; import org.codelibs.fess.es.config.exentity.WebConfig; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java index 91b0a6730a116cebefeb632b917ece40624e2a42..39bd1fcb40926e89c84b09e37db28397b2b923a7 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java @@ -22,10 +22,10 @@ import javax.annotation.Resource; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.RolePager; import org.codelibs.fess.app.service.RoleService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.user.exentity.Role; import org.codelibs.fess.util.ComponentUtil; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java index 2d897154dbd7cb3bf8b1c592f9356ba247b7921a..f60d70e9843fc2a5b90e3bd7e8655d85365a574e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java @@ -21,10 +21,10 @@ import java.util.Base64; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.SchedulerPager; import org.codelibs.fess.app.service.ScheduledJobService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.ScheduledJob; import org.codelibs.fess.helper.ProcessHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java index 4e0a4136f854093c21f5d07551643be6f2d8acfe..d047b09b2ff2ceebda9943611a6d7dc182e6a923 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java @@ -28,8 +28,8 @@ import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.core.net.URLUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.entity.SearchRenderData; import org.codelibs.fess.es.client.FessEsClient; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/AdminSearchlogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/AdminSearchlogAction.java index 2af15ea1274a497bb3d971a02e41623714247072..709eb1424a43a8e674f904b36d025b42844f1b84 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/AdminSearchlogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/AdminSearchlogAction.java @@ -18,10 +18,10 @@ package org.codelibs.fess.app.web.admin.searchlog; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.SearchLogPager; import org.codelibs.fess.app.service.SearchLogService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.util.RenderDataUtil; import org.lastaflute.web.Execute; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java b/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java index 37afbe518c17832ad96f7c277386dd14cf97d9d4..f63c0b855daaf3e6927d2e2c99f56debe78f6b80 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java @@ -28,7 +28,7 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.crawler.Constants; import org.codelibs.fess.exception.StorageException; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java b/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java index 86431108d9906763a3c56316486531763efc939d..c041e8dffae59e0fa4fef61e8a7a5e0c2742c42a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java @@ -17,7 +17,7 @@ package org.codelibs.fess.app.web.admin.suggest; import javax.annotation.Resource; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.helper.SuggestHelper; import org.lastaflute.web.Execute; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java index ad6dc59fee525a8faa0556101cf6584c881af8b8..f5f18ef50b54f612a91c7de71a0a79ac67714c76 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java @@ -25,7 +25,7 @@ import javax.annotation.Resource; import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.web.annotation.Secured; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java index 572b1415913a2319dc5623fd261974abbc2188ba..c93e9998dac2e49798151f02984b62eb486b8a0c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java @@ -19,8 +19,8 @@ import javax.annotation.Resource; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.service.ScheduledJobService; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.es.config.exbhv.DataConfigBhv; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index 47b0dadae3f56a1d7a7465916e6d057d842b59b3..435c5620739cb1462c8a3f79f9cc6549dd414e52 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java @@ -26,12 +26,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.UserPager; import org.codelibs.fess.app.service.GroupService; import org.codelibs.fess.app.service.RoleService; import org.codelibs.fess.app.service.UserService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.app.web.base.login.FessLoginAssist; import org.codelibs.fess.es.user.exentity.User; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java index ec5d50b036e5b0934a63a8dc9a5a8e3b8d84ca2d..b1c6d341a00652fee097ff1f402ad0756289ab0e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java @@ -24,11 +24,11 @@ import java.util.Map; import javax.annotation.Resource; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.WebAuthPager; import org.codelibs.fess.app.service.WebAuthenticationService; import org.codelibs.fess.app.service.WebConfigService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.WebAuthentication; import org.codelibs.fess.es.config.exentity.WebConfig; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java index 3421093642154da3065b9f813305285021d844dd..683cdfe8a01fd8a7d20c064ff76946ef24a973b3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java @@ -25,13 +25,13 @@ import javax.annotation.Resource; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.WebConfigPager; import org.codelibs.fess.app.service.LabelTypeService; import org.codelibs.fess.app.service.RoleTypeService; import org.codelibs.fess.app.service.ScheduledJobService; import org.codelibs.fess.app.service.WebConfigService; import org.codelibs.fess.app.web.CrudMode; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.WebConfig; import org.codelibs.fess.helper.PermissionHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java index 9ac2eac535688d41ecb8977661c70286f5dd4347..7c3e5f5aaad38be26c84313d55a9f32627d4e3cc 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java @@ -27,10 +27,10 @@ import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.service.FileConfigService; import org.codelibs.fess.app.service.ScheduledJobService; import org.codelibs.fess.app.service.WebConfigService; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.crawler.util.CharUtil; import org.codelibs.fess.es.config.exentity.FileConfig; diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java index bc6d7b0289da1776eb283f163bbb53f95531e136..cb8274c263a41e7f5bf07e9a838edf36f04bb24d 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java @@ -20,8 +20,8 @@ import java.util.function.Function; import javax.annotation.Resource; +import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.RootAction; -import org.codelibs.fess.app.web.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.app.web.login.LoginAction; import org.codelibs.fess.entity.FessUser;