0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modify error page

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-08-29 06:39:18 +09:00
parent e7eb7e72c8
commit aa9cfdaff4
4 changed files with 58 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -141,9 +141,7 @@
<exclude>org/codelibs/fess/app/web/admin/FileAuthenticationForm.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/RequestHeaderAction.java</exclude>
<exclude>org/codelibs/fess/app/web/base/AbstractLoginAction.java</exclude>
<exclude>org/codelibs/fess/app/web/ErrorAction.java</exclude>
<exclude>org/codelibs/fess/app/web/LoginAction.java</exclude>
<exclude>org/codelibs/fess/app/web/ErrorForm.java</exclude>
<exclude>org/codelibs/fess/app/web/LoginForm.java</exclude>
</excludes>
</configuration>

46
src/main/java/org/codelibs/fess/app/web/ErrorAction.java
View file

@ -1,46 +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.app.web;
import javax.annotation.Resource;
public class ErrorAction {
//@ActionForm
@Resource
protected ErrorForm errorForm;
//@Execute(validator = false)
public String index() {
return "notFound.jsp";
}
//@Execute(validator = false)
public String systemError() {
return "system.jsp";
}
//@Execute(validator = false)
public String badRequest() {
return "badRequest.jsp";
}
//@Execute(validator = false)
public String notFound() {
return "notFound.jsp";
}
}

56
src/main/java/org/codelibs/fess/app/web/error/ErrorAction.java Normal file
View file

@ -0,0 +1,56 @@
/*
* 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.app.web.error;
import org.codelibs.fess.app.web.base.FessSearchAction;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
public class ErrorAction extends FessSearchAction {
// ===================================================================================
// Constant
//
// ===================================================================================
// Attribute
//
// ===================================================================================
// Search Execute
// ==============
@Execute
public HtmlResponse index(final ErrorForm form) {
return asHtml(path_Error_NotFoundJsp);
}
@Execute
public HtmlResponse systemError(final ErrorForm form) {
return asHtml(path_Error_SystemJsp);
}
@Execute
public HtmlResponse badRequest(final ErrorForm form) {
return asHtml(path_Error_BadRequestJsp);
}
@Execute
public HtmlResponse notFound(final ErrorForm form) {
return asHtml(path_Error_NotFoundJsp);
}
}

3
src/main/java/org/codelibs/fess/app/web/ErrorForm.java → src/main/java/org/codelibs/fess/app/web/error/ErrorForm.java
View file

@ -14,7 +14,7 @@
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web;
package org.codelibs.fess.app.web.error;
import java.io.Serializable;
@ -23,4 +23,5 @@ public class ErrorForm implements Serializable {
private static final long serialVersionUID = 1L;
public String url;
}