You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/06/29 00:18:03 UTC
svn commit: r551716 - in /logging/log4j/companions/zeroconf/trunk: ./
src/assembly/ src/changes/ src/main/java/org/apache/log4j/net/
src/main/resources/ src/main/resources/META-INF/ src/site/ src/site/apt/
src/test/resources/
Author: carnold
Date: Thu Jun 28 15:18:01 2007
New Revision: 551716
URL: http://svn.apache.org/viewvc?view=rev&rev=551716
Log:
Bug 42773: Harmonization of zeroconf with other companions
Added:
logging/log4j/companions/zeroconf/trunk/build.xml
- copied, changed from r551364, logging/log4j/companions/component/trunk/build.xml
logging/log4j/companions/zeroconf/trunk/src/assembly/
- copied from r551310, logging/log4j/companions/component/trunk/src/assembly/
logging/log4j/companions/zeroconf/trunk/src/changes/
- copied from r551310, logging/log4j/companions/component/trunk/src/changes/
logging/log4j/companions/zeroconf/trunk/src/changes/changes.xml
- copied, changed from r551364, logging/log4j/companions/component/trunk/src/changes/changes.xml
logging/log4j/companions/zeroconf/trunk/src/main/resources/
logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/
logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/LICENSE
logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/NOTICE
logging/log4j/companions/zeroconf/trunk/src/site/
- copied from r551310, logging/log4j/companions/component/trunk/src/site/
logging/log4j/companions/zeroconf/trunk/src/test/resources/
Modified:
logging/log4j/companions/zeroconf/trunk/ (props changed)
logging/log4j/companions/zeroconf/trunk/NOTICE
logging/log4j/companions/zeroconf/trunk/pom.xml
logging/log4j/companions/zeroconf/trunk/src/assembly/bin.xml
logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/ZeroConfSocketHubAppender.java
logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/Zeroconf4log4j.java
logging/log4j/companions/zeroconf/trunk/src/site/apt/download.apt
logging/log4j/companions/zeroconf/trunk/src/site/apt/index.apt
logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt
logging/log4j/companions/zeroconf/trunk/src/site/site.xml
Propchange: logging/log4j/companions/zeroconf/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 28 15:18:01 2007
@@ -0,0 +1,9 @@
+target
+cobertura.ser
+surefire*
+.classpath
+.project
+.settings
+apache-log4j-zeroconf*
+
+
Modified: logging/log4j/companions/zeroconf/trunk/NOTICE
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/NOTICE?view=diff&rev=551716&r1=551715&r2=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/NOTICE (original)
+++ logging/log4j/companions/zeroconf/trunk/NOTICE Thu Jun 28 15:18:01 2007
@@ -1,4 +1,4 @@
-Apache log4j ExpressionFilter
+Apache Zeroconf Companion for log4j 1.2.
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Copied: logging/log4j/companions/zeroconf/trunk/build.xml (from r551364, logging/log4j/companions/component/trunk/build.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/build.xml?view=diff&rev=551716&p1=logging/log4j/companions/component/trunk/build.xml&r1=551364&p2=logging/log4j/companions/zeroconf/trunk/build.xml&r2=551716
==============================================================================
--- logging/log4j/companions/component/trunk/build.xml (original)
+++ logging/log4j/companions/zeroconf/trunk/build.xml Thu Jun 28 15:18:01 2007
@@ -29,8 +29,8 @@
<property file="build.properties"/>
<!-- project details -->
- <property name="project.name" value="apache-log4j-component"/>
- <property name="project.title" value="Apache Component Companion for log4j 1.2."/>
+ <property name="project.name" value="apache-log4j-zerconf"/>
+ <property name="project.title" value="Apache Zeroconf Companion for log4j 1.2."/>
<property name="project.version" value="1.0"/>
<property name="project.jar" value="${project.name}-${project.version}.jar"/>
@@ -40,12 +40,15 @@
<!-- Versions for dependencies -->
<property name="log4j.version" value="1.2.9"/>
<property name="junit.version" value="3.8.1"/>
+ <property name="jmdns.version" value="1.0"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
<property name="junit.jar"
location="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
<property name="log4j.jar"
location="${m2_repo}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar"/>
+ <property name="jmdns.jar"
+ location="${m2_repo}/jmdns/jmdns/${jmdns.version}/jmdns-${jmdns.version}.jar"/>
<!-- Java compiler settings -->
<property name="javac.source" value="1.2"/>
@@ -68,7 +71,7 @@
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
- classpath="${log4j.jar}"/>
+ classpath="${log4j.jar}:${jmdns.jar}"/>
<copy todir="target/classes" overwrite="true">
<fileset dir="src/main/resources"/>
</copy>
@@ -97,7 +100,7 @@
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
- classpath="${companion.jar}:${log4j.jar}:${junit.jar}"/>
+ classpath="${companion.jar}:${log4j.jar}:${jmdns.jar}:${junit.jar}"/>
<copy todir="target/test-classes" overwrite="true">
<fileset dir="src/test/resources"/>
</copy>
@@ -106,7 +109,7 @@
<target name="test" depends="test-compile" description="Run unit tests">
<junit printsummary="yes" fork="true" dir="target">
- <classpath path="target/test-classes:${companion.jar}:${log4j.jar}:${junit.jar}"/>
+ <classpath path="target/test-classes:${companion.jar}:${log4j.jar}:${jmdns.jar}:${junit.jar}"/>
<batchtest>
<fileset dir="src/test/java/">
<include name="**/Test*.java"/>
Modified: logging/log4j/companions/zeroconf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/pom.xml?view=diff&rev=551716&r1=551715&r2=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/pom.xml (original)
+++ logging/log4j/companions/zeroconf/trunk/pom.xml Thu Jun 28 15:18:01 2007
@@ -1,12 +1,173 @@
-<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/maven-v4_0_0.xsd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>log4j</groupId>
- <artifactId>log4j-zeroconf</artifactId>
+ <artifactId>apache-log4j-zeroconf</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
- <name>log4j-zeroconf</name>
- <url>http://maven.apache.org</url>
+ <name>Apache Zeroconf Companion for log4j 1.2.</name>
+ <description>This companion provides an appender that uses Zeroconf to advertise its presence.</description>
+ <url>http://logging.apache.org:80/log4j/companions/zeroconf</url>
+ <issueManagement>
+ <system>Bugzilla</system>
+ <url>http://issues.apache.org/bugzilla/</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Gump</system>
+ <url>http://vmgump.apache.org/gump/public/logging-log4j-zeroconf/logging-log4j-zeroconf/index.html</url>
+ </ciManagement>
+<mailingLists>
+ <mailingList>
+ <name>log4j-user</name>
+ <subscribe>log4j-user-subscribe@logging.apache.org</subscribe>
+ <unsubscribe>log4j-user-unsubscribe@logging.apache.org</unsubscribe>
+ <post>log4j-user@logging.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-user/</archive>
+ <otherArchives>
+ <otherArchive>http://marc.theaimsgroup.com/?l=log4j-user&r=1&w=2</otherArchive>
+ <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.user</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>log4j-dev</name>
+ <subscribe>log4j-dev-subscribe@logging.apache.org</subscribe>
+ <unsubscribe>log4j-dev-unsubscribe@logging.apache.org</unsubscribe>
+ <post>log4j-dev@logging.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive>
+ <otherArchives>
+ <otherArchive>http://marc.theaimsgroup.com/?l=log4j-dev&r=1&w=2</otherArchive>
+ <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive>
+ </otherArchives>
+ </mailingList>
+</mailingLists>
+<licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+</licenses>
+<scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/zeroconf/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/zeroconf/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/zeroconf/trunk</url>
+</scm>
+<organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+</organization>
+<build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <workingDirectory>target</workingDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.2</source>
+ <target>1.1</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestSections>
+ <manifestSection>
+ <name>org.apache.log4j</name>
+ <manifestEntries>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>site</phase>
+ <id>untag-site</id>
+ <configuration>
+ <tasks>
+ <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
+ <replaceregexp file="target/site/source-repository.html" match="/tags/[^ ]*" replace="/trunk" flags="g" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -14,5 +175,74 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.9</version>
+ </dependency>
+ <dependency>
+ <groupId>jmdns</groupId>
+ <artifactId>jmdns</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>scm</report>
+ <report>dependencies</report>
+ <report>cim</report>
+ <report>issue-tracking</report>
+ <report>mailing-list</report>
+ <report>license</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <goals>site-deploy</goals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <distributionManagement>
+ <repository>
+ <id>logging.repo</id>
+ <url>scp://people.apache.org/www/people.apache.org/builds/logging/repo/</url>
+ </repository>
+ <site>
+ <id>logging.site</id>
+ <url>scp://people.apache.org/www/logging.apache.org/log4j/companions/zeroconf</url>
+ </site>
+ </distributionManagement>
</project>
Modified: logging/log4j/companions/zeroconf/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/assembly/bin.xml?view=diff&rev=551716&r1=551310&r2=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/assembly/bin.xml (original)
+++ logging/log4j/companions/zeroconf/trunk/src/assembly/bin.xml Thu Jun 28 15:18:01 2007
@@ -21,7 +21,7 @@
<format>zip</format>
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-log4j-component-${project.version}</baseDirectory>
+ <baseDirectory>apache-log4j-zeroconf-${project.version}</baseDirectory>
<includeSiteDirectory>true</includeSiteDirectory>
<fileSets>
<fileSet>
@@ -37,7 +37,7 @@
<directory>target</directory>
<outputDirectory>.</outputDirectory>
<includes>
- <include>apache-log4j-component-${project.version}.jar</include>
+ <include>apache-log4j-zeroconf-${project.version}.jar</include>
</includes>
</fileSet>
</fileSets>
Copied: logging/log4j/companions/zeroconf/trunk/src/changes/changes.xml (from r551364, logging/log4j/companions/component/trunk/src/changes/changes.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/changes/changes.xml?view=diff&rev=551716&p1=logging/log4j/companions/component/trunk/src/changes/changes.xml&r1=551364&p2=logging/log4j/companions/zeroconf/trunk/src/changes/changes.xml&r2=551716
==============================================================================
--- logging/log4j/companions/component/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/zeroconf/trunk/src/changes/changes.xml Thu Jun 28 15:18:01 2007
@@ -17,11 +17,11 @@
-->
<document>
<properties>
- <title>Apache Component Companion for log4j 1.2.</title>
+ <title>Apache Zeroconf Companion for log4j 1.2.</title>
</properties>
<body>
- <release version="1.0" date="2007-06-27" description="Initial release">
- <action issue="42094" type="add">
+ <release version="1.0" date="2007-06-28" description="Initial release">
+ <action issue="42773" type="add">
Initial release of Component framework backported from log4j 1.3.
</action>
</release>
Modified: logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/ZeroConfSocketHubAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/ZeroConfSocketHubAppender.java?view=diff&rev=551716&r1=551715&r2=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/ZeroConfSocketHubAppender.java (original)
+++ logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/ZeroConfSocketHubAppender.java Thu Jun 28 15:18:01 2007
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.log4j.net;
import java.io.IOException;
Modified: logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/Zeroconf4log4j.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/Zeroconf4log4j.java?view=diff&rev=551716&r1=551715&r2=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/Zeroconf4log4j.java (original)
+++ logging/log4j/companions/zeroconf/trunk/src/main/java/org/apache/log4j/net/Zeroconf4log4j.java Thu Jun 28 15:18:01 2007
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.log4j.net;
import javax.jmdns.JmDNS;
Added: logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/LICENSE?view=auto&rev=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/LICENSE (added)
+++ logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/LICENSE Thu Jun 28 15:18:01 2007
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/NOTICE?view=auto&rev=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/NOTICE (added)
+++ logging/log4j/companions/zeroconf/trunk/src/main/resources/META-INF/NOTICE Thu Jun 28 15:18:01 2007
@@ -0,0 +1,5 @@
+Apache Zeroconf Companion for log4j 1.2.
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
Modified: logging/log4j/companions/zeroconf/trunk/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/site/apt/download.apt?view=diff&rev=551716&r1=551310&r2=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/site/apt/download.apt (original)
+++ logging/log4j/companions/zeroconf/trunk/src/site/apt/download.apt Thu Jun 28 15:18:01 2007
@@ -13,14 +13,14 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
-Download apache-log4j-component
+Download apache-log4j-zeroconf
------
------
------
-Download apache-log4j-component
+Download apache-log4j-zeroconf
- Apache Component Companion for log4j 1.2 is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 2.0}}.
+ Apache Zeroconf Companion for log4j 1.2 is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 2.0}}.
The link in the Mirrors column should display a list of available mirrors with a
default selection based on your inferred location. If you do not see that page,
@@ -30,9 +30,9 @@
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| apache-log4j-component-1.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.tar.gz} apache-log4j-component-1.0.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.tar.gz.md5} apache-log4j-component-1.0.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.tar.gz.asc} apache-log4j-component-1.0.tar.gz.asc}} |
+| apache-log4j-zeroconf-1.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/zeroconf/1.0/apache-log4j-zeroconf-1.0.tar.gz} apache-log4j-zeroconf-1.0.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/companions/zeroconf/1.0/apache-log4j-zeroconf-1.0.tar.gz.md5} apache-log4j-zeroconf-1.0.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/zeroconf/1.0/apache-log4j-zeroconf-1.0.tar.gz.asc} apache-log4j-zeroconf-1.0.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| apache-log4j-component-1.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.zip} apache-log4j-component-1.0.zip}} | {{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.zip.md5} apache-log4j-component-1.0.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.zip.asc} apache-log4j-component-1.0.zip.asc}} |
+| apache-log4j-zeroconf-1.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/zeroconf/1.0/apache-log4j-zeroconf-1.0.zip} apache-log4j-zeroconf-1.0.zip}} | {{{http://www.apache.org/dist/logging/log4j/companions/zeroconf/1.0/apache-log4j-zeroconf-1.0.zip.md5} apache-log4j-zeroconf-1.0.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/zeroconf/1.0/apache-log4j-zeroconf-1.0.zip.asc} apache-log4j-zeroconf-1.0.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server Releases}}
Modified: logging/log4j/companions/zeroconf/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/site/apt/index.apt?view=diff&rev=551716&r1=551310&r2=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/site/apt/index.apt (original)
+++ logging/log4j/companions/zeroconf/trunk/src/site/apt/index.apt Thu Jun 28 15:18:01 2007
@@ -13,11 +13,9 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- Apache Component Companion for log4j 1.2
+ Apache Zeroconf Companion for log4j 1.2
------
------
------
- This companion implements on log4j 1.2 the component framework from the
- discontinued log4j 1.3 development activity to support backporting
- log4j 1.3 code that depends on the framework.
+ This companion provides the ZeroConfSocketHubAppender, originally developed for Chainsaw, for independent use with log4j 1.2.
\ No newline at end of file
Modified: logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt?view=diff&rev=551716&r1=551310&r2=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt (original)
+++ logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt Thu Jun 28 15:18:01 2007
@@ -13,13 +13,13 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- apache-log4j-component Roadmap
+ apache-log4j-zeroconf Roadmap
------
Curt Arnold
------
- 4 June 2007
+ 28 June 2007
------
-apache-log4j-component Roadmap
+apache-log4j-zeroconf Roadmap
- No additional development is anticipated.
+ No additional development is currently anticipated.
Modified: logging/log4j/companions/zeroconf/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/site/site.xml?view=diff&rev=551716&r1=551310&r2=551716
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/site/site.xml (original)
+++ logging/log4j/companions/zeroconf/trunk/src/site/site.xml Thu Jun 28 15:18:01 2007
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<project name="Component">
+<project name="Zeroconf">
<bannerLeft>
<name>Logging Services</name>
<src>images/ls-logo.jpg</src>
@@ -32,7 +32,7 @@
<item name="Logging Services" href="http://logging.apache.org/"/>
<item name="log4j" href="http://logging.apache.org/log4j/"/>
<item name="Companions" href="http://logging.apache.org/log4j/companions/"/>
- <item name="component" href="http://logging.apache.org:80/log4j/companions/component/"/>
+ <item name="zeroconf" href="http://logging.apache.org:80/log4j/companions/zeroconf/"/>
</breadcrumbs>
<menu name="Get component">
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org