diff --git a/TODO.txt b/TODO.txt index 830c5838..d4f0700e 100644 --- a/TODO.txt +++ b/TODO.txt @@ -5,7 +5,7 @@ TODO部分: 1.主要改动 - * 重做Login及其他安全页面(页面权限控制,showcase的RS,Test Helper, enable/diable用户) + * 重做Login及其他安全页面(showcase的RS,Test Helper, enable/diable用户) * 用Spring Data JPA代替BaseDao基类,清理Hibernate基类及相关 2.次要改动 diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/schedule/JdkExecutorJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/schedule/JdkExecutorJobTest.java index a126bc88..b711211b 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/schedule/JdkExecutorJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/schedule/JdkExecutorJobTest.java @@ -12,7 +12,7 @@ import org.springside.modules.test.data.Fixtures; import org.springside.modules.test.spring.SpringTxTestCase; import org.springside.modules.utils.Threads; -@Ignore("unstatable on Jenkins") +@Ignore("Unstatable on Jenkins") @DirtiesContext @ContextConfiguration(locations = { "/applicationContext-test.xml", "/schedule/applicationContext-executor.xml" }) @TransactionConfiguration(transactionManager = "defaultTransactionManager") diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/schedule/QuartzClusterableJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/schedule/QuartzClusterableJobTest.java index f43322d4..e75a04a2 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/schedule/QuartzClusterableJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/schedule/QuartzClusterableJobTest.java @@ -2,11 +2,11 @@ package org.springside.examples.showcase.schedule; import static org.junit.Assert.*; +import org.junit.Ignore; import org.junit.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.transaction.TransactionConfiguration; -import org.springside.examples.showcase.schedule.QuartzClusterableJob; import org.springside.modules.log.MockLog4jAppender; import org.springside.modules.test.data.Fixtures; import org.springside.modules.test.spring.SpringTxTestCase; @@ -17,6 +17,7 @@ import org.springside.modules.utils.Threads; * * @author calvin */ +@Ignore("Unstatable on Jenkins") @DirtiesContext @ContextConfiguration(locations = { "/applicationContext-test.xml", "/schedule/applicationContext-quartz-timer-cluster.xml" })