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/04/20 06:30:50 UTC
svn commit: r530637 - in /logging/sandbox/log4j/component: ./ src/changes/
src/site/ src/site/resources/ src/site/resources/css/
src/site/resources/images/ src/test/java/org/apache/log4j/plugins/
src/test/java/org/apache/log4j/util/ src/test/resources/...
Author: carnold
Date: Thu Apr 19 21:30:48 2007
New Revision: 530637
URL: http://svn.apache.org/viewvc?view=rev&rev=530637
Log:
Bug 42094: Adding tests (currently failing) and web content
Added:
logging/sandbox/log4j/component/src/changes/
logging/sandbox/log4j/component/src/changes/changes.xml
logging/sandbox/log4j/component/src/site/
logging/sandbox/log4j/component/src/site/resources/
logging/sandbox/log4j/component/src/site/resources/css/
logging/sandbox/log4j/component/src/site/resources/css/site.css
logging/sandbox/log4j/component/src/site/resources/images/
logging/sandbox/log4j/component/src/site/resources/images/logo.jpg
- copied unchanged from r530531, logging/log4j/trunk/src/site/resources/images/logo.jpg
logging/sandbox/log4j/component/src/site/resources/images/ls-logo.jpg (with props)
logging/sandbox/log4j/component/src/site/site.xml
logging/sandbox/log4j/component/src/test/java/org/apache/log4j/plugins/
logging/sandbox/log4j/component/src/test/java/org/apache/log4j/plugins/PluginTestCase.java
- copied, changed from r530535, logging/log4j/trunk/tests/src/java/org/apache/log4j/plugins/PluginTestCase.java
logging/sandbox/log4j/component/src/test/java/org/apache/log4j/util/
logging/sandbox/log4j/component/src/test/java/org/apache/log4j/util/Compare.java
- copied, changed from r530536, logging/log4j/trunk/tests/src/java/org/apache/log4j/util/Compare.java
logging/sandbox/log4j/component/src/test/resources/ (with props)
logging/sandbox/log4j/component/src/test/resources/witness/
logging/sandbox/log4j/component/src/test/resources/witness/plugins.PluginTestCase.test1.txt
- copied unchanged from r530581, logging/log4j/trunk/tests/witness/plugins.PluginTestCase.test1.txt
Modified:
logging/sandbox/log4j/component/pom.xml
Modified: logging/sandbox/log4j/component/pom.xml
URL: http://svn.apache.org/viewvc/logging/sandbox/log4j/component/pom.xml?view=diff&rev=530637&r1=530636&r2=530637
==============================================================================
--- logging/sandbox/log4j/component/pom.xml (original)
+++ logging/sandbox/log4j/component/pom.xml Thu Apr 19 21:30:48 2007
@@ -22,12 +22,15 @@
<artifactId>apache-log4j-component</artifactId>
<packaging>jar</packaging>
<version>0.1-SNAPSHOT</version>
- <name>apache-log4j-component</name>
- <description>log4j 1.3 component framework</description>
- <url>http://logging.apache.org</url>
+ <name>Component</name>
+ <description>This companion emulates the log4j 1.3 Component Framework to
+ simplify the back-porting of code that made use of its services. It does
+ not provide any immediately useful functionality to log4j by itself,
+ but is used by Receivers and Chainsaw.</description>
+ <url>http://logging.apache.org/log4j/companions/component</url>
<issueManagement>
<system>Bugzilla</system>
- <url>http://issues.apache.org/bugzilla</url>
+ <url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<mailingLists>
<mailingList>
@@ -53,6 +56,14 @@
</otherArchives>
</mailingList>
</mailingLists>
+<developers>
+ <developer>
+ <id>carnold</id>
+ <name>Curt Arnold</name>
+ <email>carnold@apache.org</email>
+ <timezone>-6</timezone>
+ </developer>
+ </developers>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -88,6 +99,19 @@
<target>1.3</target>
</configuration>
</plugin>
+ <!-- clean stray cobertura.ser -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -122,7 +146,35 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <!-- plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <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>
</plugins>
</reporting>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/home/carnold/public_html/log4j/companions/component</url>
+ </site>
+ </distributionManagement>
</project>
Added: logging/sandbox/log4j/component/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/sandbox/log4j/component/src/changes/changes.xml?view=auto&rev=530637
==============================================================================
--- logging/sandbox/log4j/component/src/changes/changes.xml (added)
+++ logging/sandbox/log4j/component/src/changes/changes.xml Thu Apr 19 21:30:48 2007
@@ -0,0 +1 @@
+<!--
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.
-->
<document>
<properties>
<title>Component</title>
</properties>
<body>
<release version="0.1" date="2099-01-01" description="First release">
<action dev="carnold" issue="42094" type="add">
Initial release of Component framework backported from log4j 1.3.
</action>
</release>
</body>
</document>
\ No newline at end of file
Added: logging/sandbox/log4j/component/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/logging/sandbox/log4j/component/src/site/resources/css/site.css?view=auto&rev=530637
==============================================================================
--- logging/sandbox/log4j/component/src/site/resources/css/site.css (added)
+++ logging/sandbox/log4j/component/src/site/resources/css/site.css Thu Apr 19 21:30:48 2007
@@ -0,0 +1 @@
+
Added: logging/sandbox/log4j/component/src/site/resources/images/ls-logo.jpg
URL: http://svn.apache.org/viewvc/logging/sandbox/log4j/component/src/site/resources/images/ls-logo.jpg?view=auto&rev=530637
==============================================================================
Binary file - no diff available.
Propchange: logging/sandbox/log4j/component/src/site/resources/images/ls-logo.jpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: logging/sandbox/log4j/component/src/site/resources/images/ls-logo.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: logging/sandbox/log4j/component/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/sandbox/log4j/component/src/site/site.xml?view=auto&rev=530637
==============================================================================
--- logging/sandbox/log4j/component/src/site/site.xml (added)
+++ logging/sandbox/log4j/component/src/site/site.xml Thu Apr 19 21:30:48 2007
@@ -0,0 +1 @@
+<!--
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 name="Component">
<bannerLeft>
<name>Logging Services</name>
<src>images/ls-logo.jpg</src>
<href>http://logging.apache.org/</href>
</bannerLeft>
<bannerRight>
<src>images/logo.jpg<
/src>
</bannerRight>
<body>
<links>
<item name="Apache" href="http://www.apache.org/" />
<item name="Logging Services" href="http://logging.apache.org/"/>
<item name="Log4j" href="http://logging.apache.org/log4j/"/>
<item name="Log4j Companions" href="http://logging.apache.org/log4j/companions"/>
</links>
{$reports}
</body>
</project>
\ No newline at end of file
Copied: logging/sandbox/log4j/component/src/test/java/org/apache/log4j/plugins/PluginTestCase.java (from r530535, logging/log4j/trunk/tests/src/java/org/apache/log4j/plugins/PluginTestCase.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/log4j/component/src/test/java/org/apache/log4j/plugins/PluginTestCase.java?view=diff&rev=530637&p1=logging/log4j/trunk/tests/src/java/org/apache/log4j/plugins/PluginTestCase.java&r1=530535&p2=logging/sandbox/log4j/component/src/test/java/org/apache/log4j/plugins/PluginTestCase.java&r2=530637
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/plugins/PluginTestCase.java (original)
+++ logging/sandbox/log4j/component/src/test/java/org/apache/log4j/plugins/PluginTestCase.java Thu Apr 19 21:30:48 2007
@@ -38,6 +38,7 @@
import java.io.IOException;
import java.util.HashMap;
+import org.apache.log4j.LoggerRepositoryExImpl;
public class PluginTestCase extends TestCase {
@@ -48,18 +49,13 @@
private static HashMap repositoryMap = new HashMap();
PluginRegistry pluginRegistry;
- public PluginTestCase(String name) {
- super(name);
- }
public void setUp() {
- pluginRegistry = ((LoggerRepositoryEx) LogManager.getLoggerRepository()).getPluginRegistry();
-
+ pluginRegistry = new LoggerRepositoryExImpl(
+ LogManager.getLoggerRepository()).getPluginRegistry();
+
// delete the output file if they happen to exist
- File file = new File(getOutputFile("test1"));
- file.delete();
- file = new File(getOutputFile("test2"));
- file.delete();
+ new File(getOutputFile("test1")).delete();
}
private String getOutputFile(String caseName) {
@@ -86,8 +82,13 @@
root.addAppender(appender);
root.setLevel(Level.DEBUG);
}
+
+
+
+ public PluginTestCase(final String testName) {
+ super(testName);
+ }
- // basic test of plugin in standalone mode
public void test1() throws Exception {
String testName = "test1";
@@ -212,130 +213,6 @@
getWitnessFile(testName)));
}
- // basic test of plugin with repositories
- public void test2() throws Exception {
-//
-// String testName = "test2";
-// Logger logger = Logger.getLogger(testName);
-//
-// setupAppender(testName);
-//
-// PluginTester plugin1 = new PluginTester1("plugin1", 1);
-// PluginTester plugin2 = new PluginTester1("plugin2", 2);
-// PluginTester retPlugin;
-// LoggerRepository repo1 = new Hierarchy(new RootLogger(Level.DEBUG));
-// LoggerRepository repo2 = new Hierarchy(new RootLogger(Level.DEBUG));
-//
-// PluginRegistry pr1 = repo1.getPluginRegistry();
-// PluginRegistry pr2 = repo2.getPluginRegistry();
-//
-// repositoryMap.clear();
-// repositoryMap.put(repo1, "repository1");
-// repositoryMap.put(repo2, "repository2");
-//
-// logger.info("test 2.1 - starting plugins in multiple repositories");
-// logger.info("starting " + plugin1.getIdentifier() + " in " +
-// repositoryMap.get(repo1));
-// retPlugin = (PluginTester) pr1.startPlugin(plugin1);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-// logger.info("starting " + plugin2.getIdentifier() + " in " +
-// repositoryMap.get(repo2));
-// retPlugin = (PluginTester) pr2.startPlugin(plugin2);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-//
-// logger.info("test 2.2 - stopping plugins in multiple repositories");
-// logger.info("stopping " + plugin1.getIdentifier() + " in " +
-// repositoryMap.get(plugin1.getLoggerRepository()));
-// retPlugin = (PluginTester) pr1.stopPlugin(plugin1.getName());
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-// logger.info("stopping " + plugin2.getIdentifier() + " in " +
-// repositoryMap.get(plugin2.getLoggerRepository()));
-// retPlugin = (PluginTester) pr2.stopPlugin(plugin2.getName());
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-//
-// logger.info("test 2.3 - restarting plugins in different repositories");
-// logger.info("starting " + plugin1.getIdentifier() + " in " +
-// repositoryMap.get(repo2));
-// retPlugin = (PluginTester) pr2.startPlugin(plugin1);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-// logger.info("starting " + plugin2.getIdentifier() + " in " +
-// repositoryMap.get(repo1));
-// retPlugin = (PluginTester) pr1.startPlugin(plugin2);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-//
-// logger.info("test 2.4 - stopping plugins using stopAll");
-// logger.info("stopping all plugins in " + repositoryMap.get(repo1));
-// pr1.stopAllPlugins();
-// logger.info("stopping all plugins in " + repositoryMap.get(repo2));
-// pr2.stopAllPlugins();
-//
-// logger.info(
-// "test 2.5 - starting a plugin already active in another repository");
-// logger.info("starting " + plugin1.getIdentifier() + " in " +
-// repositoryMap.get(repo1));
-// retPlugin = (PluginTester) pr1.startPlugin(plugin1);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-// logger.info("starting " + plugin2.getIdentifier() + " in " +
-// repositoryMap.get(repo2));
-// retPlugin = (PluginTester) pr2.startPlugin(plugin2);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-// logger.info("restarting " + plugin1.getIdentifier() + " in " +
-// repositoryMap.get(repo2));
-// retPlugin = (PluginTester) pr2.startPlugin(plugin1);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-// logger.info("restarting " + plugin2.getIdentifier() + " in " +
-// repositoryMap.get(repo1));
-// retPlugin = (PluginTester) pr1.startPlugin(plugin2);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-//
-// logger.info("test 2.6 - handle repository reset");
-// logger.info("resetting " + repositoryMap.get(repo1));
-// repo1.resetConfiguration();
-// logger.info("resetting " + repositoryMap.get(repo2));
-// repo2.resetConfiguration();
-//
-// logger.info("test 2.7 - handle repository shutdown");
-// logger.info("starting " + plugin1.getIdentifier() + " in " +
-// repositoryMap.get(repo1));
-// retPlugin = (PluginTester) pr1.startPlugin(plugin1);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-// logger.info("starting " + plugin2.getIdentifier() + " in " +
-// repositoryMap.get(repo2));
-// retPlugin = (PluginTester) pr2.startPlugin(plugin2);
-// logger.info(
-// "returned plugin is " + retPlugin.getIdentifier() + " in " +
-// repositoryMap.get(retPlugin.getLoggerRepository()));
-// logger.info("shutting down " + repositoryMap.get(repo1));
-// repo1.shutdown();
-// logger.info("shutting down " + repositoryMap.get(repo2));
-// repo2.shutdown();
-//
-// assertTrue(Compare.compare(getOutputFile(testName),
-// getWitnessFile(testName)));
- }
-
public void testPluginListeners() {
Plugin p = new PluginTester1("MyNewPlugin", 1);
@@ -366,6 +243,7 @@
l.LastEvent != e);
}
+
public void testPropertyChangeListeners() {
Plugin plugin = new PluginTester1("PluginTest1", 1);
@@ -450,16 +328,7 @@
l.getLastEvent().getNewValue() == rep);
}
- public static Test suite() {
-
- TestSuite suite = new TestSuite();
- //suite.addTest(new PluginTestCase("test1"));
- //suite.addTest(new PluginTestCase("test2"));
- //suite.addTest(new PluginTestCase("testPropertyChangeListeners"));
- //suite.addTest(new PluginTestCase("testPluginListeners"));
-
- return suite;
- }
+
private static class PluginListenerLatch implements PluginListener {
@@ -604,8 +473,8 @@
testPlugin.getLoggerRepository())) {
logger.debug(
"plugin not equal, different repository: " +
- repositoryMap.get(this.getLoggerRepository()) + " != " +
- repositoryMap.get(testPlugin.getLoggerRepository()));
+"");// repositoryMap.get(this.getLoggerRepository()) + " != " +
+// repositoryMap.get(testPlugin.getLoggerRepository()));
}
return equiv;
@@ -631,4 +500,5 @@
id = _id;
}
}
+
}
Copied: logging/sandbox/log4j/component/src/test/java/org/apache/log4j/util/Compare.java (from r530536, logging/log4j/trunk/tests/src/java/org/apache/log4j/util/Compare.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/log4j/component/src/test/java/org/apache/log4j/util/Compare.java?view=diff&rev=530637&p1=logging/log4j/trunk/tests/src/java/org/apache/log4j/util/Compare.java&r1=530536&p2=logging/sandbox/log4j/component/src/test/java/org/apache/log4j/util/Compare.java&r2=530637
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/util/Compare.java (original)
+++ logging/sandbox/log4j/component/src/test/java/org/apache/log4j/util/Compare.java Thu Apr 19 21:30:48 2007
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.zip.GZIPInputStream;
+import java.io.*;
public class Compare {
@@ -30,9 +31,13 @@
static final int B2_NULL = -2;
public static boolean compare(String file1, String file2)
- throws FileNotFoundException, IOException {
+ throws IOException {
BufferedReader in1 = new BufferedReader(new FileReader(file1));
- BufferedReader in2 = new BufferedReader(new FileReader(file2));
+ InputStream is = Compare.class.getResourceAsStream("/" + file2);
+ if (is == null) {
+ is = new FileInputStream(file2);
+ }
+ BufferedReader in2 = new BufferedReader(new InputStreamReader(is));
try {
return compare(file1, file2, in1, in2);
} finally {
Propchange: logging/sandbox/log4j/component/src/test/resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 19 21:30:48 2007
@@ -0,0 +1 @@
+output
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org