Author: echatellier Date: 2014-06-18 18:56:41 +0200 (Wed, 18 Jun 2014) New Revision: 224 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/224 Log: Fix strange pom Added: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config Removed: trunk/faxtomail-ui-swing/src/main/filtered-resources/ Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/resources/log4j.properties Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-06-18 16:46:34 UTC (rev 223) +++ trunk/faxtomail-service/pom.xml 2014-06-18 16:56:41 UTC (rev 224) @@ -22,12 +22,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> <version>0.3-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>com.franciaflex.faxtomail</groupId> <artifactId>faxtomail-service</artifactId> @@ -163,21 +164,7 @@ </dependencies> <build> - <!--<pluginManagement>--> - <!--<plugins>--> - <!--<plugin>--> - <!--<artifactId>maven-surefire-plugin</artifactId>--> - <!--<configuration>--> - <!--<properties>--> - <!--<property>--> - <!--<name>listener</name>--> - <!--<value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value>--> - <!--</property>--> - <!--</properties>--> - <!--</configuration>--> - <!--</plugin>--> - <!--</plugins>--> - <!--</pluginManagement>--> + <plugins> <plugin> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-06-18 16:46:34 UTC (rev 223) +++ trunk/faxtomail-ui-swing/pom.xml 2014-06-18 16:56:41 UTC (rev 224) @@ -33,7 +33,6 @@ <groupId>com.franciaflex.faxtomail</groupId> <artifactId>faxtomail-ui-swing</artifactId> - <version>0.3-SNAPSHOT</version> <name>FaxToMail :: UI</name> <properties> @@ -297,18 +296,20 @@ <build> <resources> <resource> - <directory>src/main/filtered-resources</directory> - <filtering>true</filtering> + <directory>src/main/resources</directory> <includes> <include>*.config</include> <include>*.properties</include> </includes> + <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> + <excludes> + <exclude>*.config</exclude> + <exclude>*.properties</exclude> + </excludes> + <filtering>false</filtering> </resource> </resources> <plugins> Copied: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config (from rev 212, trunk/faxtomail-ui-swing/src/main/filtered-resources/faxtomail.config) =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config (rev 0) +++ trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config 2014-06-18 16:56:41 UTC (rev 224) @@ -0,0 +1,4 @@ +faxtomail.version=${project.version} +faxtomail.site.url=${project.url} +faxtomail.inceptionYear=${project.inceptionYear} +faxtomail.organizationName=${license.organizationName} \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-06-18 16:46:34 UTC (rev 223) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-06-18 16:56:41 UTC (rev 224) @@ -19,18 +19,23 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -log4j.rootCategory=WARN, console +# Global logging configuration +log4j.rootLogger=ERROR, stdout, file -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %M %m%n +# Console output +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +#log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p [%20t] (%c:%L) - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n -# global level -log4j.logger.com.franciaflex.faxtomail.ui.swing=DEBUG +# faxtomail levels +log4j.logger.com.franciaflex.faxtomail=INFO -### persistence level -# log4j.logger.org.nuiton.topia=TRACE -# log4j.logger.com.franciaflex.faxtomail.persistence=TRACE +#log4j.appender.file=org.apache.log4j.RollingFileAppender +#log4j.appender.file.file=${faxtomail.log.file} +#log4j.appender.file.MaxFileSize=10MB +#log4j.appender.file.MaxBackupIndex=4 -### services level -# log4j.logger.com.franciaflex.faxtomail.services=TRACE +#log4j.appender.file.layout=org.apache.log4j.PatternLayout +#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%20t] %c - %m%n +#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p %c - %m%n