[jboss-svn-commits] JBoss Common SVN: r2778 - common-logging-log4j/trunk.

[jboss-svn-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2008-03-31 09:11:42 -0400 (Mon, 31 Mar 2008)
New Revision: 2778

Modified:
   common-logging-log4j/trunk/.classpath
   common-logging-log4j/trunk/.project
   common-logging-log4j/trunk/pom.xml
Log:
Fixup the common message and remove circular dependencies

Modified: common-logging-log4j/trunk/.classpath
===================================================================
--- common-logging-log4j/trunk/.classpath	2008-03-31 13:11:30 UTC (rev 2777)
+++ common-logging-log4j/trunk/.classpath	2008-03-31 13:11:42 UTC (rev 2778)
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/common-core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/common-logging-spi"/>
-	<classpathentry kind="output" path="target/eclipse-classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="/common-core"/>
+	<classpathentry kind="src" path="/common-logging-spi"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: common-logging-log4j/trunk/.project
===================================================================
--- common-logging-log4j/trunk/.project	2008-03-31 13:11:30 UTC (rev 2777)
+++ common-logging-log4j/trunk/.project	2008-03-31 13:11:42 UTC (rev 2778)
@@ -1,14 +1,10 @@
 <projectDescription>
-  <name>common-logging-log4j</name>
-  <comment>JBoss Logging Log4j classes</comment>
-  <projects>
-    <project>jboss-logging-spi</project>
-    <project>jboss-common-core</project>
-  </projects>
+  <name>jboss-common-logging-log4j</name>
+  <comment>JBoss Common Logging Log4j Implementation</comment>
+  <projects/>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments/>
     </buildCommand>
   </buildSpec>
   <natures>

Modified: common-logging-log4j/trunk/pom.xml
===================================================================
--- common-logging-log4j/trunk/pom.xml	2008-03-31 13:11:30 UTC (rev 2777)
+++ common-logging-log4j/trunk/pom.xml	2008-03-31 13:11:42 UTC (rev 2778)
@@ -61,12 +61,13 @@
       <version>2.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-common-core</artifactId>
-      <version>2.0.4.GA</version>
+      <version>2.2.5-SNAPSHOT</version>
+      <optional>true</optional> <!-- For TCLFilter using org.jboss.util.WeakSet -->
       <exclusions>
         <exclusion>
-          <groupId>jboss</groupId>
+          <groupId>org.jboss</groupId>
           <artifactId>jboss-common-logging-spi</artifactId>
         </exclusion>
       </exclusions>