Author: seb Date: Mon Nov 13 22:08:01 2006 New Revision: 910 Added: logback/trunk/logback-examples/src/main/resources/setClasspath.cmd - copied, changed from r907, /logback/trunk/logback-examples/src/main/resources/setExamplesClasspath.cmd logback/trunk/logback-examples/src/main/resources/setClasspath.sh - copied, changed from r907, /logback/trunk/logback-examples/src/main/resources/setExamplesClasspath.sh Removed: logback/trunk/logback-examples/src/main/resources/setExamplesClasspath.cmd logback/trunk/logback-examples/src/main/resources/setExamplesClasspath.sh Modified: logback/trunk/logback-examples/pom.xml logback/trunk/pom.xml logback/trunk/src/main/assembly/dist.xml Log: modified script names modified script destination in assembly added versions of logback modules and slf4j to be inserted into the scripts by maven Modified: logback/trunk/logback-examples/pom.xml ============================================================================== --- logback/trunk/logback-examples/pom.xml (original) +++ logback/trunk/logback-examples/pom.xml Mon Nov 13 22:08:01 2006 @@ -55,6 +55,12 @@ </dependencies> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> Copied: logback/trunk/logback-examples/src/main/resources/setClasspath.cmd (from r907, /logback/trunk/logback-examples/src/main/resources/setExamplesClasspath.cmd) ============================================================================== --- /logback/trunk/logback-examples/src/main/resources/setExamplesClasspath.cmd (original) +++ logback/trunk/logback-examples/src/main/resources/setClasspath.cmd Mon Nov 13 22:08:01 2006 @@ -5,10 +5,10 @@ set LB_HOME=c:/SET/THIS/PARAMETER/TO/THE/FOLDER/WHERE/YOU/INSTALLED/LOGBACK REM echo %LB_HOME% -set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-classic-0.6-SNAPSHOT.jar -set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-core-0.6-SNAPSHOT.jar -set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-examples/logback-examples-0.6-SNAPSHOT.jar -set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-examples/lib/slf4j-api-1.1.0-beta0.jar +set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-classic-${project.version}.jar +set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-core-${project.version}.jar +set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-examples/logback-examples-${project.version}.jar +set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-examples/lib/slf4j-api-${slf4j.version}.jar REM echo %CLASSPATH% Copied: logback/trunk/logback-examples/src/main/resources/setClasspath.sh (from r907, /logback/trunk/logback-examples/src/main/resources/setExamplesClasspath.sh) ============================================================================== --- /logback/trunk/logback-examples/src/main/resources/setExamplesClasspath.sh (original) +++ logback/trunk/logback-examples/src/main/resources/setClasspath.sh Mon Nov 13 22:08:01 2006 @@ -4,13 +4,10 @@ # This script will add logback jars to your classpath. ## -CLASSPATH="$CLASSPATH;${PWD}/logback-access-0.6-SNAPSHOT.jar" -CLASSPATH="${CLASSPATH};${PWD}/logback-classic-0.6-SNAPSHOT.jar" -CLASSPATH="${CLASSPATH};${PWD}/logback-classic-0.6-SNAPSHOT-tests.jar" -CLASSPATH="${CLASSPATH};${PWD}/logback-core-0.6-SNAPSHOT.jar" -CLASSPATH="${CLASSPATH};${PWD}/logback-core-0.6-SNAPSHOT-tests.jar" -CLASSPATH="${CLASSPATH};${PWD}/logback-examples/logback-examples-0.6-SNAPSHOT.jar" -CLASSPATH="${CLASSPATH};${PWD}/logback-examples/lib/slf4j-api-1.1.0-beta0.jar" +CLASSPATH="${CLASSPATH};${PWD}/logback-classic-${project.version}.jar" +CLASSPATH="${CLASSPATH};${PWD}/logback-core-${project.version}.jar" +CLASSPATH="${CLASSPATH};${PWD}/logback-examples/logback-examples-${project.version}.jar" +CLASSPATH="${CLASSPATH};${PWD}/logback-examples/lib/slf4j-api-${slf4j.version}.jar" export CLASSPATH Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Mon Nov 13 22:08:01 2006 @@ -34,6 +34,10 @@ </dependency> </dependencies> + <properties> + <slf4j.version>1.1.0-RC0</slf4j.version> + </properties> + <dependencyManagement> <dependencies> <!-- Project modules --> Modified: logback/trunk/src/main/assembly/dist.xml ============================================================================== --- logback/trunk/src/main/assembly/dist.xml (original) +++ logback/trunk/src/main/assembly/dist.xml Mon Nov 13 22:08:01 2006 @@ -54,7 +54,30 @@ <exclude>*.bak</exclude> </excludes> </fileSet> - + <fileSet> + <directory>logback-site/</directory> + <outputDirectory>logback-site/</outputDirectory> + <includes> + <include> + pom.xml + </include> + </includes> + <excludes> + <exclude>*.bak</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>logback-skin/</directory> + <outputDirectory>logback-skin/</outputDirectory> + <includes> + <include> + pom.xml + </include> + </includes> + <excludes> + <exclude>*.bak</exclude> + </excludes> + </fileSet> <!-- Module Source directories --> <fileSet> <directory>logback-core/src/</directory> @@ -76,6 +99,23 @@ <fileSet> <directory>logback-examples/src/</directory> <outputDirectory>logback-examples/src/</outputDirectory> + <excludes> + <exclude> + main/resources/ + </exclude> + </excludes> + </fileSet> + <fileSet> + <directory>logback-examples/src/main/resources</directory> + <outputDirectory>logback-examples/</outputDirectory> + </fileSet> + <fileSet> + <directory>logback-site/src/</directory> + <outputDirectory>logback-site/src/</outputDirectory> + </fileSet> + <fileSet> + <directory>logback-skin/src/</directory> + <outputDirectory>logback-skin/src/</outputDirectory> </fileSet> <!-- We also include the classes of the examples module --> <fileSet> @@ -139,7 +179,7 @@ <!-- Website --> <fileSet> <directory>target/site</directory> - <outputDirectory>/site</outputDirectory> + <outputDirectory>logback-site/target/site</outputDirectory> </fileSet> <!-- Parent files -->