Fix unit tests broken for community edition

MyCollab · May 20, 2015 · 9b245d7 · 9b245d7
1 parent 7f376ba
commit 9b245d7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/mycollab-app-community/src/main/conf/logback.xml b/mycollab-app-community/src/main/conf/logback.xml
@@ -11,7 +11,7 @@
     <!-- Errors were reported during translation. -->
     <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{ABSOLUTE} %5p %c{1}:%L - %m%n</pattern>
+            <pattern>%d{"HH:mm:ss,SSS"} %5p %c{1}:%L - %m%n</pattern>
         </encoder>
     </appender>
     <appender name="email" class="com.esofthead.mycollab.configuration.MailAppender">
@@ -30,7 +30,7 @@
             <maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{ABSOLUTE} %5p %c{1}:%L - %m%n</pattern>
+            <pattern>%d{"HH:mm:ss,SSS"} %5p %c{1}:%L - %m%n</pattern>
         </encoder>
     </appender>
     <logger name="org.springframework" level="INFO"/>

diff --git a/mycollab-core/src/main/java/com/esofthead/mycollab/core/MyCollabVersion.java b/mycollab-core/src/main/java/com/esofthead/mycollab/core/MyCollabVersion.java
@@ -49,7 +49,7 @@ public static boolean isEditionNewer(String testFW) {
         return isEditionNewer(testFW, getVersion());
     }
 
-    static boolean isEditionNewer(String testFW, String baseFW) {
+    public static boolean isEditionNewer(String testFW, String baseFW) {
         try {
             int[] testVer = getVersionNumbers(testFW);
             int[] baseVer = getVersionNumbers(baseFW);

diff --git a/mycollab-jackrabbit/pom.xml b/mycollab-jackrabbit/pom.xml
@@ -65,6 +65,10 @@
                     <groupId>org.apache.lucene</groupId>
                     <artifactId>lucene-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

diff --git a/mycollab-services/src/main/java/com/esofthead/mycollab/spring/AppServiceLoader.java b/mycollab-services/src/main/java/com/esofthead/mycollab/spring/AppServiceLoader.java
@@ -42,7 +42,7 @@ public static PropertySourcesPlaceholderConfigurer properties() {
         File myCollabResourceFile = FileUtils.getDesireFile(System.getProperty("user.dir"),
                 "conf/mycollab.properties", "src/main/conf/mycollab.properties");
 
-		if (myCollabResourceFile.exists()) {
+		if (myCollabResourceFile != null) {
 			resources = new Resource[] { new FileSystemResource(myCollabResourceFile) };
 		} else {
 			resources = new Resource[] { new ClassPathResource(

diff --git a/mycollab-test/src/main/resources/logback-test.xml b/mycollab-test/src/main/resources/logback-test.xml
@@ -2,9 +2,8 @@
 <configuration>
     <!-- Errors were reported during translation. -->
     <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-        <Target>System.out</Target>
         <encoder>
-            <pattern>%d{ABSOLUTE} %5p %t %c{1}:%L - %m%n</pattern>
+            <pattern>%d{"HH:mm:ss,SSS"} %5p %c{1}:%L - %m%n</pattern>
         </encoder>
     </appender>
     <logger name="org.springframework" level="INFO"/>

diff --git a/...ab-web/src/main/java/com/esofthead/mycollab/module/user/view/ForgotPasswordPresenter.java b/...ab-web/src/main/java/com/esofthead/mycollab/module/user/view/ForgotPasswordPresenter.java
@@ -28,12 +28,11 @@
 import com.vaadin.ui.ComponentContainer;
 
 /**
- *
+ * 
  * @author MyCollab Ltd.
  * @since 1.0
  */
-public class ForgotPasswordPresenter extends
-		AbstractPresenter<ForgotPasswordView> {
+public class ForgotPasswordPresenter extends AbstractPresenter<ForgotPasswordView> {
 	private static final long serialVersionUID = 1L;
 
 	public ForgotPasswordPresenter() {