This repository was archived by the owner on Apr 22, 2025. It is now read-only.
File tree Expand file tree Collapse file tree
mycollab-app-community/src/main/conf
mycollab-core/src/main/java/com/esofthead/mycollab/core
mycollab-services/src/main/java/com/esofthead/mycollab/spring
mycollab-test/src/main/resources
mycollab-web/src/main/java/com/esofthead/mycollab/module/user/view Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1111 <!-- Errors were reported during translation. -->
1212 <appender name =" stdout" class =" ch.qos.logback.core.ConsoleAppender" >
1313 <encoder >
14- <pattern >%d{ABSOLUTE } %5p %c{1}:%L - %m%n</pattern >
14+ <pattern >%d{"HH:mm:ss,SSS" } %5p %c{1}:%L - %m%n</pattern >
1515 </encoder >
1616 </appender >
1717 <appender name =" email" class =" com.esofthead.mycollab.configuration.MailAppender" >
3030 <maxHistory >30</maxHistory >
3131 </rollingPolicy >
3232 <encoder >
33- <pattern >%d{ABSOLUTE } %5p %c{1}:%L - %m%n</pattern >
33+ <pattern >%d{"HH:mm:ss,SSS" } %5p %c{1}:%L - %m%n</pattern >
3434 </encoder >
3535 </appender >
3636 <logger name =" org.springframework" level =" INFO" />
Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ public static boolean isEditionNewer(String testFW) {
4949 return isEditionNewer (testFW , getVersion ());
5050 }
5151
52- static boolean isEditionNewer (String testFW , String baseFW ) {
52+ public static boolean isEditionNewer (String testFW , String baseFW ) {
5353 try {
5454 int [] testVer = getVersionNumbers (testFW );
5555 int [] baseVer = getVersionNumbers (baseFW );
Original file line number Diff line number Diff line change 6565 <groupId >org.apache.lucene</groupId >
6666 <artifactId >lucene-core</artifactId >
6767 </exclusion >
68+ <exclusion >
69+ <groupId >org.slf4j</groupId >
70+ <artifactId >jcl-over-slf4j</artifactId >
71+ </exclusion >
6872 </exclusions >
6973 </dependency >
7074
Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ public static PropertySourcesPlaceholderConfigurer properties() {
4242 File myCollabResourceFile = FileUtils .getDesireFile (System .getProperty ("user.dir" ),
4343 "conf/mycollab.properties" , "src/main/conf/mycollab.properties" );
4444
45- if (myCollabResourceFile . exists () ) {
45+ if (myCollabResourceFile != null ) {
4646 resources = new Resource [] { new FileSystemResource (myCollabResourceFile ) };
4747 } else {
4848 resources = new Resource [] { new ClassPathResource (
Original file line number Diff line number Diff line change 22<configuration >
33 <!-- Errors were reported during translation. -->
44 <appender name =" stdout" class =" ch.qos.logback.core.ConsoleAppender" >
5- <Target >System.out</Target >
65 <encoder >
7- <pattern >%d{ABSOLUTE } %5p %t %c{1}:%L - %m%n</pattern >
6+ <pattern >%d{"HH:mm:ss,SSS" } %5p %c{1}:%L - %m%n</pattern >
87 </encoder >
98 </appender >
109 <logger name =" org.springframework" level =" INFO" />
Original file line number Diff line number Diff line change 2828import com .vaadin .ui .ComponentContainer ;
2929
3030/**
31- *
31+ *
3232 * @author MyCollab Ltd.
3333 * @since 1.0
3434 */
35- public class ForgotPasswordPresenter extends
36- AbstractPresenter <ForgotPasswordView > {
35+ public class ForgotPasswordPresenter extends AbstractPresenter <ForgotPasswordView > {
3736 private static final long serialVersionUID = 1L ;
3837
3938 public ForgotPasswordPresenter () {
You can’t perform that action at this time.
0 commit comments