Skip to content

S
solo
Commit e7da5f08 authored by Liang Ding's avatar Liang Ding
Browse files
Options

#268 

Latke 启动方式修改配合改造
https://github.com/b3log/b3log-latke/issues/28#issuecomment-19956320
parent 92b769ae
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 139 deletions
core/src/main/java/org/b3log/solo/SoloServletListener.java
View file @ e7da5f08
...@@ -105,9 +105,9 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -105,9 +105,9 @@ public final class SoloServletListener extends AbstractServletListener {
@Override @Override
public void contextInitialized(final ServletContextEvent servletContextEvent) { public void contextInitialized(final ServletContextEvent servletContextEvent) {
Stopwatchs.start("Context Initialized");
super.contextInitialized(servletContextEvent); super.contextInitialized(servletContextEvent);
Stopwatchs.start("Context Initialized");
// Default to skin "ease", loads from preference later // Default to skin "ease", loads from preference later
Skins.setDirectoryForTemplateLoading("ease"); Skins.setDirectoryForTemplateLoading("ease");
......
war/bae/src/main/resources/latke.properties
View file @ e7da5f08
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
# Description: B3log Latke configurations. Configures the section "Server" carefully. # Description: B3log Latke configurations. Configures the section "Server" carefully.
# Version: 1.0.0.9, May 27, 2013 # Version: 1.0.1.0, Jun 25, 2013
# Author: Liang Ding # Author: Liang Ding
# #
...@@ -33,6 +33,10 @@ staticServerPort=8080 ...@@ -33,6 +33,10 @@ staticServerPort=8080
contextPath= contextPath=
staticPath= staticPath=
#### IoC ####
# See https://github.com/b3log/b3log-latke/issues/17 for more details
scanPath=org.b3log.solo
#### Runtime Environment #### #### Runtime Environment ####
runtimeEnv=BAE runtimeEnv=BAE
......
war/gae/src/main/resources/latke.properties
View file @ e7da5f08
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
# Description: B3log Latke configurations. Configures the section "Server" carefully. # Description: B3log Latke configurations. Configures the section "Server" carefully.
# Version: 1.0.0.7, Apr 1, 2013 # Version: 1.0.0.8, Jun 25, 2013
# Author: Liang Ding # Author: Liang Ding
# #
...@@ -33,6 +33,10 @@ staticServerPort=8080 ...@@ -33,6 +33,10 @@ staticServerPort=8080
contextPath= contextPath=
staticPath= staticPath=
#### IoC ####
# See https://github.com/b3log/b3log-latke/issues/17 for more details
scanPath=org.b3log.solo
#### Runtime Environment #### #### Runtime Environment ####
runtimeEnv=GAE runtimeEnv=GAE
......
war/h2/src/main/resources/latke.properties
View file @ e7da5f08
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
# Description: B3log Latke configurations. Configures the section "Server" carefully. # Description: B3log Latke configurations. Configures the section "Server" carefully.
# Version: 1.0.0.7, Apr 1, 2013 # Version: 1.0.0.8, Jun 25, 2013
# Author: Liang Ding # Author: Liang Ding
# #
...@@ -33,6 +33,10 @@ staticServerPort=8080 ...@@ -33,6 +33,10 @@ staticServerPort=8080
contextPath= contextPath=
staticPath= staticPath=
#### IoC ####
# See https://github.com/b3log/b3log-latke/issues/17 for more details
scanPath=org.b3log.solo
#### Runtime Environment #### #### Runtime Environment ####
runtimeEnv=LOCAL runtimeEnv=LOCAL
......
war/mysql/src/main/resources/latke.properties
View file @ e7da5f08
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
# Description: B3log Latke configurations. Configures the section "Server" carefully. # Description: B3log Latke configurations. Configures the section "Server" carefully.
# Version: 1.0.0.7, Apr 1, 2013 # Version: 1.0.0.8, Jun 25, 2013
# Author: Liang Ding # Author: Liang Ding
# #
...@@ -33,6 +33,10 @@ staticServerPort=8080 ...@@ -33,6 +33,10 @@ staticServerPort=8080
contextPath= contextPath=
staticPath= staticPath=
#### IoC ####
# See https://github.com/b3log/b3log-latke/issues/17 for more details
scanPath=org.b3log.solo
#### Runtime Environment #### #### Runtime Environment ####
runtimeEnv=LOCAL runtimeEnv=LOCAL
......
war/src/main/resources/log4j.properties
View file @ e7da5f08
...@@ -27,7 +27,7 @@ log4j.appender.stdout.Target=System.out ...@@ -27,7 +27,7 @@ log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%-5p]-[%d{yyyy-MM-dd HH:mm:ss}]-[%c:%L]: %m%n log4j.appender.stdout.layout.ConversionPattern=[%-5p]-[%d{yyyy-MM-dd HH:mm:ss}]-[%c:%L]: %m%n
log4j.logger.org.b3log.solo=INFO log4j.logger.org.b3log.solo=DEBUG
log4j.logger.org.b3log.latke=TRACE log4j.logger.org.b3log.latke=DEBUG
war/src/main/webapp/WEB-INF/web.xml
View file @ e7da5f08
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<!-- <!--
Description: B3log Solo web deployment descriptor. Description: B3log Solo web deployment descriptor.
Version: 1.0.4.10, Jan 15, 2013 Version: 1.0.5.0, Jan 25, 2013
Author: Liang Ding Author: Liang Ding
--> -->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<listener> <listener>
<listener-class>org.b3log.solo.SoloServletListener</listener-class> <listener-class>org.b3log.solo.SoloServletListener</listener-class>
</listener> </listener>
<filter> <filter>
<filter-name>EncodingFilter</filter-name> <filter-name>EncodingFilter</filter-name>
<filter-class>org.b3log.latke.servlet.filter.EncodingFilter</filter-class> <filter-class>org.b3log.latke.servlet.filter.EncodingFilter</filter-class>
<init-param> <init-param>
<param-name>requestEncoding</param-name> <param-name>requestEncoding</param-name>
<param-value>UTF-8</param-value> <param-value>UTF-8</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>responseEncoding</param-name> <param-name>responseEncoding</param-name>
<param-value>UTF-8</param-value> <param-value>UTF-8</param-value>
</init-param> </init-param>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>EncodingFilter</filter-name> <filter-name>EncodingFilter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
<filter> <filter>
<filter-name>AuthFilter</filter-name> <filter-name>AuthFilter</filter-name>
<filter-class>org.b3log.solo.filter.AuthFilter</filter-class> <filter-class>org.b3log.solo.filter.AuthFilter</filter-class>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>AuthFilter</filter-name> <filter-name>AuthFilter</filter-name>
<url-pattern>/admin-index.do</url-pattern> <url-pattern>/admin-index.do</url-pattern>
<url-pattern>/admin-main.do</url-pattern> <url-pattern>/admin-main.do</url-pattern>
<url-pattern>/admin-article.do</url-pattern> <url-pattern>/admin-article.do</url-pattern>
<url-pattern>/admin-article-list.do</url-pattern> <url-pattern>/admin-article-list.do</url-pattern>
<url-pattern>/admin-comment-list.do</url-pattern> <url-pattern>/admin-comment-list.do</url-pattern>
<url-pattern>/admin-link-list.do</url-pattern> <url-pattern>/admin-link-list.do</url-pattern>
<url-pattern>/admin-preference.do</url-pattern> <url-pattern>/admin-preference.do</url-pattern>
<url-pattern>/admin-page-list.do</url-pattern> <url-pattern>/admin-page-list.do</url-pattern>
<url-pattern>/admin-others.do</url-pattern> <url-pattern>/admin-others.do</url-pattern>
<url-pattern>/admin-draft-list.do</url-pattern> <url-pattern>/admin-draft-list.do</url-pattern>
<url-pattern>/admin-user-list.do</url-pattern> <url-pattern>/admin-user-list.do</url-pattern>
<url-pattern>/admin-plugin-list.do</url-pattern> <url-pattern>/admin-plugin-list.do</url-pattern>
<url-pattern>/admin-about.do</url-pattern> <url-pattern>/admin-about.do</url-pattern>
<url-pattern>/rm-all-data.do</url-pattern> <url-pattern>/rm-all-data.do</url-pattern>
<url-pattern>/fix/*</url-pattern> <url-pattern>/fix/*</url-pattern>
</filter-mapping> </filter-mapping>
<filter> <filter>
<filter-name>PageCacheFilter</filter-name> <filter-name>PageCacheFilter</filter-name>
<filter-class>org.b3log.solo.filter.PageCacheFilter</filter-class> <filter-class>org.b3log.solo.filter.PageCacheFilter</filter-class>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>PageCacheFilter</filter-name> <filter-name>PageCacheFilter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
<filter> <filter>
<filter-name>PermalinkFilter</filter-name> <filter-name>PermalinkFilter</filter-name>
<filter-class>org.b3log.solo.filter.PermalinkFilter</filter-class> <filter-class>org.b3log.solo.filter.PermalinkFilter</filter-class>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>PermalinkFilter</filter-name> <filter-name>PermalinkFilter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
<filter> <filter>
<filter-name>InitCheckFilter</filter-name> <filter-name>InitCheckFilter</filter-name>
<filter-class>org.b3log.solo.filter.InitCheckFilter</filter-class> <filter-class>org.b3log.solo.filter.InitCheckFilter</filter-class>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>InitCheckFilter</filter-name> <filter-name>InitCheckFilter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
<session-config> <session-config>
<session-timeout> <session-timeout>
5 5
</session-timeout> </session-timeout>
</session-config> </session-config>
<servlet> <servlet>
<servlet-name>HTTPRequestDispatcher</servlet-name> <servlet-name>HTTPRequestDispatcher</servlet-name>
<servlet-class>org.b3log.latke.servlet.HTTPRequestDispatcher</servlet-class> <servlet-class>org.b3log.latke.servlet.HTTPRequestDispatcher</servlet-class>
<load-on-startup>2</load-on-startup>
<!-- Latke Request Processors Scan --> </servlet>
<!-- See https://github.com/b3log/b3log-latke/issues/17 for more details --> <servlet-mapping>
<init-param> <servlet-name>HTTPRequestDispatcher</servlet-name>
<param-name>scanPath</param-name> <url-pattern>/*</url-pattern>
<param-value>org.b3log.solo</param-value> </servlet-mapping>
</init-param>
<!-- Error Pages -->
<load-on-startup>2</load-on-startup> <error-page>
</servlet> <error-code>404</error-code>
<servlet-mapping> <location>/error/404.html</location>
<servlet-name>HTTPRequestDispatcher</servlet-name> </error-page>
<url-pattern>/*</url-pattern> <error-page>
</servlet-mapping> <error-code>403</error-code>
<location>/error/403.html</location>
<!-- Error Pages --> </error-page>
<error-page> <error-page>
<error-code>404</error-code> <error-code>500</error-code>
<location>/error/404.html</location> <location>/error/500.html</location>
</error-page> </error-page>
<error-page>
<error-code>403</error-code> </web-app>
<location>/error/403.html</location>
</error-page>
<error-page>
<error-code>500</error-code>
<location>/error/500.html</location>
</error-page>
</web-app>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment