forked from qos-ch/slf4j
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge latest changes from Ceki's fork.
- Loading branch information
Showing
249 changed files
with
24,417 additions
and
23,922 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| .settings | ||
| target | ||
| .classpath | ||
| .project | ||
| *~ | ||
| .settings | ||
| target | ||
| .classpath | ||
| .project | ||
| *~ | ||
| integration/bundle/ | ||
| integration/felix-cache/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| Copyright (c) 2004-2008 QOS.ch | ||
| All rights reserved. | ||
| Permission is hereby granted, free of charge, to any person obtaining | ||
| a copy of this software and associated documentation files (the | ||
| "Software"), to deal in the Software without restriction, including | ||
| without limitation the rights to use, copy, modify, merge, publish, | ||
| distribute, sublicense, and/or sell copies of the Software, and to | ||
| permit persons to whom the Software is furnished to do so, subject to | ||
| the following conditions: | ||
| The above copyright notice and this permission notice shall be | ||
| included in all copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| Copyright (c) 2004-2008 QOS.ch | ||
| All rights reserved. | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining | ||
| a copy of this software and associated documentation files (the | ||
| "Software"), to deal in the Software without restriction, including | ||
| without limitation the rights to use, copy, modify, merge, publish, | ||
| distribute, sublicense, and/or sell copies of the Software, and to | ||
| permit persons to whom the Software is furnished to do so, subject to | ||
| the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be | ||
| included in all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,42 @@ | ||
|
|
||
| if ($#ARGV < 1) { | ||
| print "Usage: binderVersion.pl VER FILE {FILE, FILE}\n"; | ||
| exit; | ||
| } | ||
|
|
||
| $V= $ARGV[0]; | ||
| # Trim -SNAPSHOT | ||
| $V =~ s/-SNAPSHOT//; | ||
|
|
||
| print "VER:${V}\r\n"; | ||
| shift(@ARGV); | ||
|
|
||
| sub replace () { | ||
| my $filename = $_[0]; | ||
|
|
||
| if(-s $filename) { | ||
| print "Processing [" . $filename . "]\r\n"; | ||
|
|
||
| my $original = "$filename.original"; | ||
|
|
||
| rename($filename, $original); | ||
| open(OUT, ">$filename"); | ||
| open(IN, "$original"); | ||
|
|
||
| while(<IN>) { | ||
| if(/VERSION\s+=\s+".*";/) { | ||
| s/VERSION\s+=\s+".*";/VERSION = "${V}";/; | ||
| } | ||
| print OUT; | ||
| } | ||
| close(IN); | ||
| close(OUT); | ||
| unlink($original); | ||
| } else { | ||
| print "File [" . $filename . "] does not exist\r\n" | ||
| } | ||
| } | ||
|
|
||
| foreach $ARG (@ARGV) { | ||
| do replace($ARG); | ||
| } | ||
|
|
||
| if ($#ARGV < 1) { | ||
| print "Usage: binderVersion.pl VER FILE {FILE, FILE}\n"; | ||
| exit; | ||
| } | ||
|
|
||
| $V= $ARGV[0]; | ||
| # Trim -SNAPSHOT | ||
| $V =~ s/-SNAPSHOT//; | ||
|
|
||
| print "VER:${V}\r\n"; | ||
| shift(@ARGV); | ||
|
|
||
| sub replace () { | ||
| my $filename = $_[0]; | ||
|
|
||
| if(-s $filename) { | ||
| print "Processing [" . $filename . "]\r\n"; | ||
|
|
||
| my $original = "$filename.original"; | ||
|
|
||
| rename($filename, $original); | ||
| open(OUT, ">$filename"); | ||
| open(IN, "$original"); | ||
|
|
||
| while(<IN>) { | ||
| if(/VERSION\s+=\s+".*";/) { | ||
| s/VERSION\s+=\s+".*";/VERSION = "${V}";/; | ||
| } | ||
| print OUT; | ||
| } | ||
| close(IN); | ||
| close(OUT); | ||
| unlink($original); | ||
| } else { | ||
| print "File [" . $filename . "] does not exist\r\n" | ||
| } | ||
| } | ||
|
|
||
| foreach $ARG (@ARGV) { | ||
| do replace($ARG); | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,95 @@ | ||
| <project name="integration" default="testAll" basedir="."> | ||
|
|
||
| <!-- | ||
| This build file is usually run indirectly via Maven. | ||
| When running this build file through Ant directly, you must | ||
| define the currentVersion property on the command line, e.g.: | ||
| ant -DcurrentVersion=1.5.4-SNAPSHOT | ||
| --> | ||
|
|
||
| <echo message="compile classpath: ${compile_classpath}" /> | ||
| <echo message="runtime classpath: ${runtime_classpath}" /> | ||
| <echo message="test classpath: ${test_classpath}" /> | ||
| <echo message="plugin classpath: ${plugin_classpath}" /> | ||
|
|
||
| <path id="path150"> | ||
| <pathelement location="xtarget/classes/" /> | ||
| <pathelement location="target/test-classes/" /> | ||
| <pathelement location="../slf4j-api/target/slf4j-api-${currentVersion}.jar" /> | ||
| <pathelement location="./lib/slf4j-simple-1.5.0.jar" /> | ||
| </path > | ||
|
|
||
| <path id="pathIncompatible"> | ||
| <pathelement location="xtarget/classes/" /> | ||
| <pathelement location="target/test-classes/" /> | ||
| <pathelement location="../slf4j-api/target/slf4j-api-${currentVersion}.jar" /> | ||
| <pathelement location="./lib/slf4j-simple-INCOMPATIBLE.jar" /> | ||
| </path > | ||
|
|
||
| <path id="pathCurrent"> | ||
| <pathelement location="xtarget/classes/" /> | ||
| <pathelement location="target/test-classes/" /> | ||
| <pathelement location="../slf4j-api/target/slf4j-api-${currentVersion}.jar" /> | ||
| <pathelement location="../slf4j-simple/target/slf4j-simple-${currentVersion}.jar" /> | ||
| </path > | ||
|
|
||
|
|
||
| <path id="multiBinding"> | ||
| <pathelement location="xtarget/classes/" /> | ||
| <pathelement location="target/test-classes/" /> | ||
| <pathelement location="../slf4j-api/target/slf4j-api-${currentVersion}.jar" /> | ||
| <pathelement location="./lib/slf4j-simple-1.5.0.jar" /> | ||
| <pathelement location="./lib/slf4j-nop-1.5.6.jar" /> | ||
| </path > | ||
|
|
||
| <!-- this is really very ugly, but it's the only way to circumvent | ||
| http://jira.codehaus.org/browse/MANTRUN-95 | ||
| --> | ||
| <taskdef name="junit" classpath="${plugin_classpath};${compile_classpath}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" /> | ||
|
|
||
| <target name="init"> | ||
| <mkdir dir="target/unit-reports" /> | ||
| </target> | ||
|
|
||
| <target name="testAll" depends="init, | ||
| testMismatch, | ||
| testPre155, | ||
| testMatch, | ||
| testMultiBinding"> | ||
| </target> | ||
|
|
||
| <target name="testMismatch"> | ||
| <junit printsummary="yes" fork="no" haltonfailure="yes"> | ||
| <classpath refid="pathIncompatible" /> | ||
| <formatter type="plain" /> | ||
| <test fork="yes" todir="target/unit-reports" name="org.slf4j.VersionMismatchTest" /> | ||
| </junit> | ||
| </target> | ||
|
|
||
| <target name="testPre155"> | ||
| <junit printsummary="yes" fork="no" haltonfailure="yes"> | ||
| <classpath refid="path150" /> | ||
| <formatter type="plain" /> | ||
| <test fork="yes" todir="target/unit-reports" name="org.slf4j.Pre155VersionTest" /> | ||
| </junit> | ||
| </target> | ||
|
|
||
| <target name="testMatch"> | ||
| <junit printsummary="yes" fork="no" haltonfailure="yes"> | ||
| <classpath refid="pathCurrent" /> | ||
| <formatter type="plain" /> | ||
| <test fork="yes" todir="target/unit-reports" name="org.slf4j.VersionMatchTest" /> | ||
| </junit> | ||
| </target> | ||
|
|
||
| <target name="testMultiBinding"> | ||
| <junit printsummary="yes" fork="no" haltonfailure="yes"> | ||
| <classpath refid="multiBinding" /> | ||
| <formatter type="plain" /> | ||
| <test fork="yes" todir="target/unit-reports" name="org.slf4j.MultiBindingTest" /> | ||
| </junit> | ||
| </target> | ||
| <project name="integration" default="testAll" basedir="."> | ||
|
|
||
| <!-- | ||
| This build file is usually run indirectly via Maven. | ||
| When running this build file through Ant directly, you must | ||
| define the currentVersion property on the command line, e.g.: | ||
| ant -DcurrentVersion=1.5.4-SNAPSHOT | ||
| --> | ||
|
|
||
| <echo message="compile classpath: ${compile_classpath}" /> | ||
| <echo message="runtime classpath: ${runtime_classpath}" /> | ||
| <echo message="test classpath: ${test_classpath}" /> | ||
| <echo message="plugin classpath: ${plugin_classpath}" /> | ||
|
|
||
| <path id="path150"> | ||
| <pathelement location="xtarget/classes/" /> | ||
| <pathelement location="target/test-classes/" /> | ||
| <pathelement location="../slf4j-api/target/slf4j-api-${currentVersion}.jar" /> | ||
| <pathelement location="./lib/slf4j-simple-1.5.0.jar" /> | ||
| </path > | ||
|
|
||
| <path id="pathIncompatible"> | ||
| <pathelement location="xtarget/classes/" /> | ||
| <pathelement location="target/test-classes/" /> | ||
| <pathelement location="../slf4j-api/target/slf4j-api-${currentVersion}.jar" /> | ||
| <pathelement location="./lib/slf4j-simple-INCOMPATIBLE.jar" /> | ||
| </path > | ||
|
|
||
| <path id="pathCurrent"> | ||
| <pathelement location="xtarget/classes/" /> | ||
| <pathelement location="target/test-classes/" /> | ||
| <pathelement location="../slf4j-api/target/slf4j-api-${currentVersion}.jar" /> | ||
| <pathelement location="../slf4j-simple/target/slf4j-simple-${currentVersion}.jar" /> | ||
| </path > | ||
|
|
||
|
|
||
| <path id="multiBinding"> | ||
| <pathelement location="xtarget/classes/" /> | ||
| <pathelement location="target/test-classes/" /> | ||
| <pathelement location="../slf4j-api/target/slf4j-api-${currentVersion}.jar" /> | ||
| <pathelement location="./lib/slf4j-simple-1.5.0.jar" /> | ||
| <pathelement location="./lib/slf4j-nop-1.5.6.jar" /> | ||
| </path > | ||
|
|
||
| <!-- this is really very ugly, but it's the only way to circumvent | ||
| http://jira.codehaus.org/browse/MANTRUN-95 | ||
| --> | ||
| <taskdef name="junit" classpath="${plugin_classpath};${compile_classpath}" | ||
| classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" /> | ||
|
|
||
| <target name="init"> | ||
| <mkdir dir="target/unit-reports" /> | ||
| </target> | ||
|
|
||
| <target name="testAll" depends="init, | ||
| testMismatch, | ||
| testPre155, | ||
| testMatch, | ||
| testMultiBinding"> | ||
| </target> | ||
|
|
||
| <target name="testMismatch"> | ||
| <junit printsummary="yes" fork="no" haltonfailure="yes"> | ||
| <classpath refid="pathIncompatible" /> | ||
| <formatter type="plain" /> | ||
| <test fork="yes" todir="target/unit-reports" name="org.slf4j.VersionMismatchTest" /> | ||
| </junit> | ||
| </target> | ||
|
|
||
| <target name="testPre155"> | ||
| <junit printsummary="yes" fork="no" haltonfailure="yes"> | ||
| <classpath refid="path150" /> | ||
| <formatter type="plain" /> | ||
| <test fork="yes" todir="target/unit-reports" name="org.slf4j.Pre155VersionTest" /> | ||
| </junit> | ||
| </target> | ||
|
|
||
| <target name="testMatch"> | ||
| <junit printsummary="yes" fork="no" haltonfailure="yes"> | ||
| <classpath refid="pathCurrent" /> | ||
| <formatter type="plain" /> | ||
| <test fork="yes" todir="target/unit-reports" name="org.slf4j.VersionMatchTest" /> | ||
| </junit> | ||
| </target> | ||
|
|
||
| <target name="testMultiBinding"> | ||
| <junit printsummary="yes" fork="no" haltonfailure="yes"> | ||
| <classpath refid="multiBinding" /> | ||
| <formatter type="plain" /> | ||
| <test fork="yes" todir="target/unit-reports" name="org.slf4j.MultiBindingTest" /> | ||
| </junit> | ||
| </target> | ||
| </project> |
Oops, something went wrong.