diff --git a/.log4j.metadata b/.log4j.metadata new file mode 100644 index 0000000..5d5dd15 --- /dev/null +++ b/.log4j.metadata @@ -0,0 +1 @@ +5cfc7a5b8042fada2d2030f1ddbfd165c769fdc6 SOURCES/log4j-1.2.17.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-logfactor5-changed-userdir.patch b/SOURCES/0001-logfactor5-changed-userdir.patch new file mode 100644 index 0000000..95aa5fa --- /dev/null +++ b/SOURCES/0001-logfactor5-changed-userdir.patch @@ -0,0 +1,56 @@ +From bf8f55bbc9baddcb67d0b89edd859f93ce3c949f Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Mon, 17 May 2010 12:57:36 +0200 +Subject: [PATCH 01/10] logfactor5 changed userdir + +--- + .../lf5/viewer/configure/ConfigurationManager.java | 2 +- + .../log4j/lf5/viewer/configure/MRUFileManager.java | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java b/src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java +index a94ffab..81191f2 100644 +--- a/src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java ++++ b/src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java +@@ -344,7 +344,7 @@ public class ConfigurationManager extends Object { + String home = System.getProperty("user.home"); + String sep = System.getProperty("file.separator"); + +- return home + sep + "lf5" + sep + CONFIG_FILE_NAME; ++ return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME; + } + + //-------------------------------------------------------------------------- +diff --git a/src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java b/src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java +index 6ff275d..ca40d5a 100644 +--- a/src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java ++++ b/src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java +@@ -175,14 +175,14 @@ public class MRUFileManager { + + /** + * Creates the directory where the MRU file list will be written. +- * The "lf5" directory is created in the Documents and Settings ++ * The ".logfactor5" directory is created in the Documents and Settings + * directory on Windows 2000 machines and where ever the user.home + * variable points on all other platforms. + */ + public static void createConfigurationDirectory() { + String home = System.getProperty("user.home"); + String sep = System.getProperty("file.separator"); +- File f = new File(home + sep + "lf5"); ++ File f = new File(home + sep + ".logfactor5"); + if (!f.exists()) { + try { + f.mkdir(); +@@ -268,7 +268,7 @@ public class MRUFileManager { + String home = System.getProperty("user.home"); + String sep = System.getProperty("file.separator"); + +- return home + sep + "lf5" + sep + CONFIG_FILE_NAME; ++ return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME; + } + + /** +-- +1.6.6.1 + diff --git a/SOURCES/0006-Remove-mvn-clirr-plugin.patch b/SOURCES/0006-Remove-mvn-clirr-plugin.patch new file mode 100644 index 0000000..bf632ca --- /dev/null +++ b/SOURCES/0006-Remove-mvn-clirr-plugin.patch @@ -0,0 +1,40 @@ +From 324dcac505e1c2c3f313392769713cff2aec2d59 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Mon, 17 May 2010 13:59:46 +0200 +Subject: [PATCH 06/10] Remove mvn-clirr-plugin + +for now this is included in current mvn in Fedora. Remove once +clirr-plugin is separate +--- + pom.xml | 15 --------------- + 1 files changed, 0 insertions(+), 15 deletions(-) + +diff --git a/pom.xml b/pom.xml +index c273581..6e32bb7 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -350,21 +350,6 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line. + + + +- +- +- org.codehaus.mojo +- clirr-maven-plugin +- 2.2.2 +- +- 1.2.15 +- +- + + org.codehaus.mojo + rat-maven-plugin +-- +1.6.6.1 + diff --git a/SOURCES/0009-Fix-tests.patch b/SOURCES/0009-Fix-tests.patch new file mode 100644 index 0000000..3918a50 --- /dev/null +++ b/SOURCES/0009-Fix-tests.patch @@ -0,0 +1,34 @@ +From 91349164c1d44eec50ac1b09ef3e2ff41b4aa468 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Thu, 11 Jul 2013 11:13:45 +0200 +Subject: [PATCH] Fix tests + +--- + tests/build.xml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/build.xml b/tests/build.xml +index 74a7139..9149da2 100644 +--- a/tests/build.xml ++++ b/tests/build.xml +@@ -31,13 +31,13 @@ + the Maven repository can provide all the dependencies. --> + + +- ++ + + +- +- ++ ++ + +- ++ + + + +-- +1.8.1.4 + diff --git a/SOURCES/0010-Fix-javadoc-link.patch b/SOURCES/0010-Fix-javadoc-link.patch new file mode 100644 index 0000000..44a7cc2 --- /dev/null +++ b/SOURCES/0010-Fix-javadoc-link.patch @@ -0,0 +1,26 @@ +From 4753784d3e8ed5ec9973f67e9017bcb7ef41b4b1 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Tue, 18 May 2010 15:07:00 +0200 +Subject: [PATCH 10/10] Fix javadoc link + +--- + build.xml | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/build.xml b/build.xml +index 54bad8f..c775a68 100644 +--- a/build.xml ++++ b/build.xml +@@ -517,8 +517,7 @@ + -->' + bottom="Copyright 2000-2007 Apache Software Foundation."> + +- +- ++ + + + +-- +1.6.6.1 + diff --git a/SOURCES/0011-Remove-openejb.patch b/SOURCES/0011-Remove-openejb.patch new file mode 100644 index 0000000..1e11911 --- /dev/null +++ b/SOURCES/0011-Remove-openejb.patch @@ -0,0 +1,30 @@ +From 003125dc826417e1bf41b4a1bc344eeca715e3cf Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Thu, 14 Jun 2012 10:33:03 +0200 +Subject: [PATCH 1/2] Remove openejb from dependencies + +--- + pom.xml | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 8ddbbc2..a627c48 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -528,13 +528,6 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line. + 1.4.3 + true + +- +- org.apache.openejb +- javaee-api +- 5.0-2 +- jar +- provided +- +