init

0001-Port-build-script-to-Maven-3.patch

@@ -0,0 +1,89 @@
+From 40d80d630a54f263722d1f9ffd199530ce600159 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 14 Jun 2016 13:44:17 +0200
+Subject: [PATCH 1/3] Port build script to Maven 3
+
+---
+ project.xml | 49 +++++++++++++++++++++++++++++++------------------
+ 1 file changed, 31 insertions(+), 18 deletions(-)
+
+diff --git a/project.xml b/project.xml
+index 155b2b7..b32e4d1 100644
+--- a/project.xml
++++ b/project.xml
+@@ -16,41 +16,54 @@
+  limitations under the License.
+ -->
+ <project>
+-    <extend>${basedir}/../project-common.xml</extend>
++    <modelVersion>4.0.0</modelVersion>
+ 
+     <name>Avalon Logkit</name>
+-    <id>avalon-logkit</id>
++    <groupId>avalon-logkit</groupId>
++    <artifactId>avalon-logkit</artifactId>
++    <version>2.1</version>
+ 
+     <inceptionYear>1997</inceptionYear>
+-    <shortDescription>Excalibur's Logkit package</shortDescription>
+     <description>
+ Log4j-like logging toolkit.
+     </description>
+ 
+     <dependencies>
+       <dependency>
+-        <id>log4j</id>
++        <groupId>log4j</groupId>
++        <artifactId>log4j</artifactId>
+         <version>1.2.11</version>
++        <optional>true</optional>
+       </dependency>
+       <dependency>
+-        <id>servletapi</id>
+-        <version>2.3</version>
++        <groupId>javax.servlet</groupId>
++        <artifactId>servlet-api</artifactId>
++        <version>2.5</version>
++        <optional>true</optional>
+       </dependency>
+       <dependency>
+-        <groupId>geronimo-spec</groupId>
+-        <artifactId>geronimo-spec-javamail</artifactId>
+-        <version>1.3.1-rc3</version>
+-        <properties note="Placeholder.  Systems using mail features should use an actual implementation.  Sun for example.">
+-            <build>true</build>
+-        </properties>
++        <groupId>javax.mail</groupId>
++        <artifactId>mail</artifactId>
++        <version>1.4.3</version>
++        <scope>provided</scope>
+       </dependency>  
+       <dependency>
+-        <groupId>geronimo-spec</groupId>
+-        <artifactId>geronimo-spec-jms</artifactId>
+-        <version>1.1-rc4</version>
+-        <properties note="Placeholder.  Systems using JMS features should use an actual implementation.  Sun for example.">
+-            <build>true</build>
+-        </properties>
++        <groupId>org.apache.geronimo.specs</groupId>
++        <artifactId>geronimo-jms_1.1_spec</artifactId>
++        <version>1.1.1</version>
++        <scope>provided</scope>
++      </dependency>
++
++      <dependency>
++        <groupId>junit</groupId>
++        <artifactId>junit</artifactId>
++        <version>4.12</version>
++        <scope>test</scope>
+       </dependency>
+     </dependencies>
++
++    <build>
++      <sourceDirectory>src/java</sourceDirectory>
++      <testSourceDirectory>src/test</testSourceDirectory>
++    </build>
+ </project>
+-- 
+2.5.5
+

0002-Port-to-Java-7.patch

@@ -0,0 +1,29 @@
+From 02cbfaf4835946ce72b454da3696240313772a07 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 14 Jun 2016 13:49:00 +0200
+Subject: [PATCH 2/3] Port to Java 7
+
+---
+ src/java/org/apache/log/output/db/DefaultDataSource.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/java/org/apache/log/output/db/DefaultDataSource.java b/src/java/org/apache/log/output/db/DefaultDataSource.java
+index c19b507..864c48a 100644
+--- a/src/java/org/apache/log/output/db/DefaultDataSource.java
++++ b/src/java/org/apache/log/output/db/DefaultDataSource.java
+@@ -111,4 +111,12 @@ public class DefaultDataSource
+     {
+         m_logWriter = logWriter;
+     }
++    
++    public boolean isWrapperFor(Class<?> iface) {
++    	return false;
++    }
++
++    public <T> T unwrap(java.lang.Class<T> iface) {return null;}
++    
++    public java.util.logging.Logger getParentLogger() {return null;}
+ }
+-- 
+2.5.5
+

0003-Fix-encoding.patch

@@ -0,0 +1,41 @@
+From 8fd096a56d52beb49e37db17254b57bb3aef860f Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 14 Jun 2016 13:53:27 +0200
+Subject: [PATCH 3/3] Fix encoding
+
+---
+ src/java/org/apache/log/ContextMap.java | 4 ++--
+ src/java/org/apache/log/Logger.java     | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/java/org/apache/log/ContextMap.java b/src/java/org/apache/log/ContextMap.java
+index 046106b..2305955 100644
+--- a/src/java/org/apache/log/ContextMap.java
++++ b/src/java/org/apache/log/ContextMap.java
+@@ -29,8 +29,8 @@ import java.util.Hashtable;
+  * <li>hostname  -&gt;helm.realityforge.org</li>
+  * <li>ipaddress -&gt;1.2.3.4</li>
+  * <li>interface -&gt;127.0.0.1</li>
+- * <li>caller <20> <20>-&gt;com.biz.MyCaller.method(MyCaller.java:18)</li>
+- * <li>source <20> <20>-&gt;1.6.3.2:33</li>
++ * <li>caller    -&gt;com.biz.MyCaller.method(MyCaller.java:18)</li>
++ * <li>source    -&gt;1.6.3.2:33</li>
+  * </ul>
+  * The context is bound to a thread (and inherited by sub-threads) but
+  * it can also be added to by LogTargets.
+diff --git a/src/java/org/apache/log/Logger.java b/src/java/org/apache/log/Logger.java
+index 43ce1b7..d1f7efd 100644
+--- a/src/java/org/apache/log/Logger.java
++++ b/src/java/org/apache/log/Logger.java
+@@ -295,7 +295,7 @@ public class Logger
+     }
+ 
+     /**
+-     * Determine if messages of priority <20>will be logged.
++     * Determine if messages of priority will be logged.
+      * @param priority the priority
+      * @return true if messages will be logged
+      */
+-- 
+2.5.5
+

README.en.md

@@ -1,36 +0,0 @@
-# avalon-logkit
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,39 +0,0 @@
-# avalon-logkit
-
-#### 介绍
-{**以下是码云平台说明，您可以替换此简介**
-码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

avalon-logkit.spec

@@ -0,0 +1,78 @@
+Name:           avalon-logkit
+Epoch:          0
+Version:        2.1
+Release:        31
+Summary:        Java logging toolkit
+License:        ASL 2.0
+URL:            http://avalon.apache.org/
+BuildArch:      noarch
+Source0:        http://archive.apache.org/dist/excalibur/%{name}/source/%{name}-%{version}-src.zip
+
+Patch0001:      0001-Port-build-script-to-Maven-3.patch
+Patch0002:      0002-Port-to-Java-7.patch
+Patch0003:      0003-Fix-encoding.patch
+
+BuildRequires:  maven-local mvn(javax.mail:mail) mvn(javax.servlet:servlet-api)
+BuildRequires:  mvn(junit:junit) mvn(log4j:log4j) mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec)
+
+%description
+LogKit is a logging framework built to be simple to get started with, efficient to execute, safe
+for shipping code, and extensible for flexibility.
+
+%package help
+Summary:        API documentation for avalon-logkit
+Provides:       %{name}-javadoc = %{version}-%{release}
+Obsoletes:      %{name}-javadoc < %{version}-%{release}
+
+%description help
+API documentation for avalon-logkit.
+
+%prep
+%autosetup -p1
+mv project.xml pom.xml
+%pom_remove_dep log4j:log4j
+find . -type d -name lf5 | xargs rm -rf
+
+%mvn_file :  avalon-logkit
+%mvn_alias : logkit:logkit
+
+%pom_xpath_inject pom:project "<packaging>bundle</packaging>"
+%pom_xpath_inject pom:build "
+  <plugins>
+    <plugin>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>maven-bundle-plugin</artifactId>
+      <extensions>true</extensions>
+      <configuration>
+        <instructions>
+          <Bundle-SymbolicName>avalon-logkit-2.1</Bundle-SymbolicName>
+          <_nouses>true</_nouses>
+        </instructions>
+      </configuration>
+    </plugin>
+  </plugins>"
+
+%build
+%mvn_build -f
+
+%install
+%mvn_install
+
+%files
+%license LICENSE.txt NOTICE.txt
+%{_datadir}/java/avalon-logkit.jar
+%{_datadir}/maven-metadata/avalon-logkit.xml
+%{_datadir}/maven-poms/avalon-logkit.pom
+
+%files help -f .mfiles-javadoc
+
+%changelog
+* Thu Dec 12 2019 lijin Yang <yanglijin@huawei.com> - 1.1-3
+- init package
+
+* Tue May 07 2019 zhangyujing <zhangyujing1@huawei.com> - 0:2.1-30.h1
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Eliminate differences