Author: carnold
Date: Wed Jul 4 10:46:41 2007
New Revision: 553281
URL: http://svn.apache.org/viewvc?view=rev&rev=553281
Log:
Bug 42783: Remove companions that were rolled into extras
Removed:
logging/log4j/companions/filters/
logging/log4j/companions/logmf/
logging/log4j/companions/logsf/
logging/log4j/companions/pattern-layout/
logging/log4j/companions/rolling/
logging/log4j/companions/sound/
Modified:
logging/log4j/companions/component/trunk/pom.xml
logging/log4j/companions/extras/trunk/pom.xml
logging/log4j/companions/extras/trunk/src/site/site.xml
logging/log4j/companions/receivers/trunk/build.xml
logging/log4j/companions/receivers/trunk/pom.xml
Modified: logging/log4j/companions/component/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/pom.xml?view=diff&rev=553281&r1=553280&r2=553281
==============================================================================
--- logging/log4j/companions/component/trunk/pom.xml (original)
+++ logging/log4j/companions/component/trunk/pom.xml Wed Jul 4 10:46:41 2007
@@ -33,7 +33,7 @@
</issueManagement>
<ciManagement>
<system>Gump</system>
-
<url>http://vmgump.apache.org/gump/public/logging-log4j-component/logging-log4j-component/index.html</url>
+
<url>http://vmgump.apache.org/gump/public/logging-log4j-chainsaw/logging-log4j-chainsaw/index.html</url>
</ciManagement>
<mailingLists>
<mailingList>
Modified: logging/log4j/companions/extras/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/pom.xml?view=diff&rev=553281&r1=553280&r2=553281
==============================================================================
--- logging/log4j/companions/extras/trunk/pom.xml (original)
+++ logging/log4j/companions/extras/trunk/pom.xml Wed Jul 4 10:46:41 2007
@@ -74,7 +74,17 @@
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
+<pluginRepositories>
+</pluginRepositories>
<build>
+ <!-- See
http://maven.apache.org/guides/development/guide-plugin-snapshot-repositories.html
-->
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-scm</artifactId>
+ <version>1.0-beta-3</version>
+ </extension>
+ </extensions>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -245,7 +255,7 @@
</repository>
<site>
<id>logging.site</id>
-
<url>scp://people.apache.org/www/logging.apache.org/log4j/companions/extras</url>
+
<url>scm:svn:https://svn.apache.org/repos/asf/logging/site/trunk/docs/site/log4j/companions/extras</url>
</site>
</distributionManagement>
</project>
Modified: logging/log4j/companions/extras/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/site/site.xml?view=diff&rev=553281&r1=553280&r2=553281
==============================================================================
--- logging/log4j/companions/extras/trunk/src/site/site.xml (original)
+++ logging/log4j/companions/extras/trunk/src/site/site.xml Wed Jul 4 10:46:41
2007
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<project name="Filters">
+<project name="Extras">
<bannerLeft>
<name>Logging Services</name>
<src>images/ls-logo.jpg</src>
@@ -32,16 +32,16 @@
<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="filters"
href="http://logging.apache.org:80/log4j/companions/filters/"/>
+ <item name="extras"
href="http://logging.apache.org:80/log4j/companions/extras/"/>
</breadcrumbs>
- <menu name="Get filters">
+ <menu name="Get extras">
<item name="Download" href="/download.html"/>
<item name="Changes" href="/changes-report.html"/>
<item name="License" href="/license.html"/>
</menu>
- <menu name="About filters">
+ <menu name="About extras">
<item name="What is it?" href="/index.html"/>
<item name="Roadmap" href="/roadmap.html"/>
<item name="JavaDoc" href="/apidocs/index.html"/>
@@ -60,5 +60,13 @@
<item name="Duplication" href="/cpd.html"/>
<item name="PMD" href="/pmd.html"/>
</menu>
+
+ <menu name="Apache">
+ <item name="Home" href="http://www.apache.org"/>
+ <item name="Sponsorship"
href="http://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks"
href="http://www.apache.org/foundation/thanks.html"/>
+ <item name="Conferences" href="http://www.apachecon.com"/>
+ </menu>
+
</body>
</project>
Modified: logging/log4j/companions/receivers/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/build.xml?view=diff&rev=553281&r1=553280&r2=553281
==============================================================================
--- logging/log4j/companions/receivers/trunk/build.xml (original)
+++ logging/log4j/companions/receivers/trunk/build.xml Wed Jul 4 10:46:41 2007
@@ -43,7 +43,7 @@
<property name="oro.version" value="2.0.8"/>
<property name="hsqldb.version" value="1.8.0.7"/>
<property name="component.version" value="1.0"/>
- <property name="filters.version" value="1.0"/>
+ <property name="extras.version" value="1.0"/>
<property name="jms.version" value="1.1"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
@@ -53,8 +53,8 @@
location="${m2_repo}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar"/>
<property name="component.jar"
location="${m2_repo}/log4j/apache-log4j-component/${component.version}/apache-log4j-component-${component.version}.jar"/>
- <property name="filters.jar"
-
location="${m2_repo}/log4j/apache-log4j-filters/${filters.version}/apache-log4j-filters-${filters.version}.jar"/>
+ <property name="extras.jar"
+
location="${m2_repo}/log4j/apache-log4j-extras/${extras.version}/apache-log4j-extras-${extras.version}.jar"/>
<property name="oro.jar"
location="${m2_repo}/oro/oro/${oro.version}/oro-${oro.version}.jar"/>
<property name="jms.jar"
@@ -82,7 +82,7 @@
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
-
classpath="${log4j.jar}:${oro.jar}:${component.jar}:${filters.jar}:${jms.jar}"/>
+
classpath="${log4j.jar}:${oro.jar}:${component.jar}:${extras.jar}:${jms.jar}"/>
<copy todir="target/classes" overwrite="true">
<fileset dir="src/main/resources"/>
</copy>
@@ -111,7 +111,7 @@
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
-
classpath="${companion.jar}:${hsqldb.jar}:${junit.jar}:${log4j.jar}:${oro.jar}:${component.jar}:${filters.jar}:${jms.jar}"/>
+
classpath="${companion.jar}:${hsqldb.jar}:${junit.jar}:${log4j.jar}:${oro.jar}:${component.jar}:${extras.jar}:${jms.jar}"/>
<copy todir="target/test-classes" overwrite="true">
<fileset dir="src/test/resources"/>
</copy>
@@ -120,7 +120,7 @@
<target name="test" depends="test-compile" description="Run unit tests">
<junit printsummary="yes" fork="yes" dir="target">
- <classpath
path="target/test-classes:${companion.jar}:${hsqldb.jar}:${junit.jar}:${log4j.jar}:${oro.jar}:${component.jar}:${filters.jar}:${jms.jar}"/>
+ <classpath
path="target/test-classes:${companion.jar}:${hsqldb.jar}:${junit.jar}:${log4j.jar}:${oro.jar}:${component.jar}:${extras.jar}:${jms.jar}"/>
<batchtest>
<fileset dir="src/test/java/">
<include name="**/Test*.java"/>
Modified: logging/log4j/companions/receivers/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/pom.xml?view=diff&rev=553281&r1=553280&r2=553281
==============================================================================
--- logging/log4j/companions/receivers/trunk/pom.xml (original)
+++ logging/log4j/companions/receivers/trunk/pom.xml Wed Jul 4 10:46:41 2007
@@ -193,7 +193,7 @@
</dependency>
<dependency>
<groupId>log4j</groupId>
- <artifactId>apache-log4j-filters</artifactId>
+ <artifactId>apache-log4j-extras</artifactId>
<version>1.0</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
