diff --git a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java b/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java index 01ff78be..b5dc5879 100644 --- a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java +++ b/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java @@ -6,7 +6,6 @@ import java.net.URL; import java.sql.Driver; import org.eclipse.jetty.server.Server; -import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.openqa.selenium.By; @@ -63,11 +62,6 @@ public class BaseFunctionalTestCase { loginAsAdminIfNecessary(); } - @AfterClass - public static void afeterClass() throws Exception { - //quitSelenium(); - } - /** * 启动Jetty服务器, 仅启动一次. */ diff --git a/examples/showcase/assembly-standalone.xml b/examples/showcase/assembly-standalone.xml index 72bad511..536a08aa 100644 --- a/examples/showcase/assembly-standalone.xml +++ b/examples/showcase/assembly-standalone.xml @@ -1,6 +1,6 @@ - + standalone war diff --git a/examples/showcase/bin/executable-war.bat b/examples/showcase/bin/executable-war.bat new file mode 100644 index 00000000..47eaaaac --- /dev/null +++ b/examples/showcase/bin/executable-war.bat @@ -0,0 +1,14 @@ +@echo off +echo [INFO] Packaging a executable war. + +cd %~dp0 +cd .. + +set MAVEN_OPTS=%MAVEN_OPTS% +call mvn clean package -Pstandalone + +echo [INFO] Executable war had been packaged as target/showcase-4.x.x.standalone.war + + +cd bin +pause \ No newline at end of file diff --git a/examples/showcase/pom.xml b/examples/showcase/pom.xml index 4325fb7f..9837f9ec 100644 --- a/examples/showcase/pom.xml +++ b/examples/showcase/pom.xml @@ -582,8 +582,6 @@ single - true - false assembly-standalone.xml diff --git a/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp b/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp index 62ae48da..fe0df2cd 100644 --- a/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp +++ b/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp @@ -12,6 +12,7 @@ Web演示 WebService演示 JMX演示 + 可运行war包演示 Utilizes演示 登录 diff --git a/examples/showcase/src/main/webapp/WEB-INF/views/story/cache.jsp b/examples/showcase/src/main/webapp/WEB-INF/views/story/cache.jsp index 830c19c7..50a7561e 100644 --- a/examples/showcase/src/main/webapp/WEB-INF/views/story/cache.jsp +++ b/examples/showcase/src/main/webapp/WEB-INF/views/story/cache.jsp @@ -9,14 +9,17 @@

技术说明:

    -
  • 演示Memcached的使用
  • -
  • 演示Spring与Ehcache的集成
  • +
  • 演示基于Guava的单JVM内的,简单Cache
  • +
  • 演示基于Ehcache的JVM内的,可集群共享的,功能丰富的Cache
  • +
  • 演示基于Memcached的中央式cache,使用Spymemcached客户端
  • +

用户故事:

    -
  • 在AccountManager.java中演示了对Memcached的使用
  • +
  • GuavaCacheDemo.java演示了Guava Cache的使用
  • EhcacheDemo.java演示了Ehcache与Spring的集成
  • +
  • 在AccountManager.java中演示了对Memcached的使用
\ No newline at end of file diff --git a/examples/showcase/src/main/webapp/WEB-INF/views/story/executablewar.jsp b/examples/showcase/src/main/webapp/WEB-INF/views/story/executablewar.jsp new file mode 100644 index 00000000..d251a701 --- /dev/null +++ b/examples/showcase/src/main/webapp/WEB-INF/views/story/executablewar.jsp @@ -0,0 +1,21 @@ +<%@ page contentType="text/html;charset=UTF-8"%> + + +可执行War演示 + + + +

可运行War演示

+ +

技术说明:

+
    +
  • 可运行war使用嵌入式的Jetty,在简便的容器外运行web应用
  • +
+ +

用户故事:

+
    +
  • 在showcase中打包可运行war包的命令:mvn clean package -Pstandalone
  • +
  • 运行war包的命令: java -jar showcase-4.x.x.standalone.war
  • +
+ + \ No newline at end of file diff --git a/modules/core/src/main/java/org/springside/modules/log/Log4jManager.java b/modules/core/src/main/java/org/springside/modules/log/Log4jManager.java index 7914ec0e..eeabd925 100644 --- a/modules/core/src/main/java/org/springside/modules/log/Log4jManager.java +++ b/modules/core/src/main/java/org/springside/modules/log/Log4jManager.java @@ -31,6 +31,38 @@ public class Log4jManager { private String projectLoggerName; + @ManagedAttribute(description = "Level of the root logger") + public String getRootLoggerLevel() { + Logger logger = Logger.getRootLogger(); + return logger.getEffectiveLevel().toString(); + } + + @ManagedAttribute(description = "Level of the root logger") + public void setRootLoggerLevel(String newLevel) { + Logger logger = Logger.getRootLogger(); + Level level = Level.toLevel(newLevel); + logger.setLevel(level); + managerLogger.info("设置Root Logger 级别为{}", newLevel); + } + + /** + * 获得项目默认logger的级别. + * 项目默认logger名称通过#setProjectLoggerName(String)配置. + */ + @ManagedAttribute(description = "Project default logging level of the logger") + public String getProjectLoggerLevel() { + return getLoggerLevel(projectLoggerName); + } + + /** + * 设置项目默认logger的级别. + * 项目默认logger名称通过#setProjectLoggerName(String)配置. + */ + @ManagedAttribute(description = "Project default logging level of the logger") + public void setProjectLoggerLevel(String newLevel) { + setLoggerLevel(projectLoggerName, newLevel); + } + /** * 获取Logger的日志级别. */ @@ -55,24 +87,6 @@ public class Log4jManager { managerLogger.info("设置{}级别为{}", loggerName, newLevel); } - /** - * 获得项目默认logger的级别. - * 项目默认logger名称通过#setProjectLoggerName(String)配置. - */ - @ManagedAttribute(description = "Project default logging level of the logger") - public String getProjectLoggerLevel() { - return getLoggerLevel(projectLoggerName); - } - - /** - * 设置项目默认logger的级别. - * 项目默认logger名称通过#setProjectLoggerName(String)配置. - */ - @ManagedAttribute(description = "Project default logging level of the logger") - public void setProjectLoggerLevel(String newLevel) { - setLoggerLevel(projectLoggerName, newLevel); - } - /** * 根据log4j.properties中的定义, 设置项目默认的logger名称, 如org.springside.examples.miniweb. */ diff --git a/pom.xml b/pom.xml index bf0ce43f..c67186f2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 4.0.0.RELEASE-SNAPSHOT 3.1.1.RELEASE - 4.1.1.Final + 4.1.2 3.1.0 2.5.2 1.12 @@ -23,8 +23,8 @@ 2.0.0 1.6.4 7.6.2.v20120308 - 1.3.164 - 2.20.0 + 1.3.166 + 2.21.0 UTF-8 @@ -421,7 +421,7 @@ org.jolokia jolokia-core - 1.0.2 + 1.0.3 @@ -682,13 +682,13 @@ org.powermock powermock-module-junit4 - 1.4.11 + 1.4.12 test org.powermock powermock-api-mockito - 1.4.11 + 1.4.12 test