Revision: 1746
          http://svn.sourceforge.net/spring-rich-c/?rev=1746&view=rev
Author:   ge0ffrey
Date:     2007-04-18 02:53:50 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
logging fixes, so log4j doesn't leak out RCP-466

Modified Paths:
--------------
    trunk/spring-richclient/binding/pom.xml
    trunk/spring-richclient/core/pom.xml
    trunk/spring-richclient/form/pom.xml
    trunk/spring-richclient/pom.xml
    trunk/spring-richclient/samples/petclinic/gui/pom.xml
    trunk/spring-richclient/samples/petclinic/server/pom.xml
    trunk/spring-richclient/samples/petclinic/standalone/pom.xml
    trunk/spring-richclient/samples/simple/pom.xml
    trunk/spring-richclient/sandbox/pom.xml
    trunk/spring-richclient/src/site/site.xml
    trunk/spring-richclient/vldocking/pom.xml

Modified: trunk/spring-richclient/binding/pom.xml
===================================================================
--- trunk/spring-richclient/binding/pom.xml     2007-04-16 14:15:14 UTC (rev 
1745)
+++ trunk/spring-richclient/binding/pom.xml     2007-04-18 09:53:50 UTC (rev 
1746)
@@ -15,11 +15,18 @@
     </description>
 
     <dependencies>
+        <!-- Internal -->
         <dependency>
             <groupId>org.springframework.richclient</groupId>
             <artifactId>spring-richclient-core</artifactId>
-        </dependency>    
+        </dependency>
         
+        <!-- Logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
         <!-- Binding and validation -->
         <dependency>
             <groupId>org.springframework</groupId>

Modified: trunk/spring-richclient/core/pom.xml
===================================================================
--- trunk/spring-richclient/core/pom.xml        2007-04-16 14:15:14 UTC (rev 
1745)
+++ trunk/spring-richclient/core/pom.xml        2007-04-18 09:53:50 UTC (rev 
1746)
@@ -14,33 +14,10 @@
     <description>Core and basic classes.</description>
 
     <dependencies>
+        <!-- Dependency injection -->
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-
-            <exclusions>
-                <!-- Let the user decide what logging implementation to use,
-                    do not bring all of them in as a dependency.  (Should be
-                    fixed in the commons-logging POM, but... -->
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>logkit</groupId>
-                    <artifactId>logkit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-
-                <!-- Also pointlessly imported via the commons-logging... -->
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>spring-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

Modified: trunk/spring-richclient/form/pom.xml
===================================================================
--- trunk/spring-richclient/form/pom.xml        2007-04-16 14:15:14 UTC (rev 
1745)
+++ trunk/spring-richclient/form/pom.xml        2007-04-18 09:53:50 UTC (rev 
1746)
@@ -15,6 +15,12 @@
     </description>
 
     <dependencies>
+        <!-- Logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
     </dependencies>
 
 </project>
\ No newline at end of file

Modified: trunk/spring-richclient/pom.xml
===================================================================
--- trunk/spring-richclient/pom.xml     2007-04-16 14:15:14 UTC (rev 1745)
+++ trunk/spring-richclient/pom.xml     2007-04-18 09:53:50 UTC (rev 1746)
@@ -726,13 +726,17 @@
                         <groupId>javax.servlet</groupId>
                         <artifactId>servlet-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
-
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.2.14</version>
+                <scope>runtime</scope>
             </dependency>
 
             <!-- Dependency injection -->

Modified: trunk/spring-richclient/samples/petclinic/gui/pom.xml
===================================================================
--- trunk/spring-richclient/samples/petclinic/gui/pom.xml       2007-04-16 
14:15:14 UTC (rev 1745)
+++ trunk/spring-richclient/samples/petclinic/gui/pom.xml       2007-04-18 
09:53:50 UTC (rev 1746)
@@ -59,6 +59,12 @@
             <artifactId>commons-lang</artifactId>
             <scope>runtime</scope>
         </dependency>
+        
+        <!-- Logging -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
 
         <!-- Dependency injection -->
         <dependency>

Modified: trunk/spring-richclient/samples/petclinic/server/pom.xml
===================================================================
--- trunk/spring-richclient/samples/petclinic/server/pom.xml    2007-04-16 
14:15:14 UTC (rev 1745)
+++ trunk/spring-richclient/samples/petclinic/server/pom.xml    2007-04-18 
09:53:50 UTC (rev 1746)
@@ -26,6 +26,12 @@
             <groupId>org.springframework.richclient.samples.petclinic</groupId>
             <artifactId>spring-richclient-petclinic-business</artifactId>
         </dependency>
+        
+        <!-- Logging -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
 
         <!-- Dependency injection -->
         <dependency>

Modified: trunk/spring-richclient/samples/petclinic/standalone/pom.xml
===================================================================
--- trunk/spring-richclient/samples/petclinic/standalone/pom.xml        
2007-04-16 14:15:14 UTC (rev 1745)
+++ trunk/spring-richclient/samples/petclinic/standalone/pom.xml        
2007-04-18 09:53:50 UTC (rev 1746)
@@ -67,22 +67,29 @@
             <groupId>org.springframework.richclient</groupId>
             <artifactId>spring-richclient-core</artifactId>
         </dependency>
+        
+        <!-- Logging -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
 
         <!-- Security -->
         <dependency>
             <groupId>org.acegisecurity</groupId>
             <artifactId>acegi-security</artifactId>
         </dependency>
-        <!-- following dependencies are added so they will override the ones 
in acegisecurity, 
+        <!-- TODO clean this up as the exclusion bug is fixed
+            following dependencies are added so they will override the ones in 
acegisecurity, 
             because of the bug with exclusion we cannot exclude them. When 
acegi is used 
-            as a dependency we therefor need to overwrite the following spring 
modules-->
+            as a dependency we therefor need to overwrite the following spring 
modules -->
          <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
         </dependency>
-         <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-remoting</artifactId>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-remoting</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

Modified: trunk/spring-richclient/samples/simple/pom.xml
===================================================================
--- trunk/spring-richclient/samples/simple/pom.xml      2007-04-16 14:15:14 UTC 
(rev 1745)
+++ trunk/spring-richclient/samples/simple/pom.xml      2007-04-18 09:53:50 UTC 
(rev 1746)
@@ -67,6 +67,12 @@
             <groupId>org.springframework.richclient</groupId>
             <artifactId>spring-richclient-sandbox</artifactId>
         </dependency>
+        
+        <!-- Logging -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
 
         <!-- Dependency injection -->
         <dependency>

Modified: trunk/spring-richclient/sandbox/pom.xml
===================================================================
--- trunk/spring-richclient/sandbox/pom.xml     2007-04-16 14:15:14 UTC (rev 
1745)
+++ trunk/spring-richclient/sandbox/pom.xml     2007-04-18 09:53:50 UTC (rev 
1746)
@@ -28,6 +28,11 @@
             <artifactId>spring-richclient-support</artifactId>
             <type>test-jar</type>
         </dependency>
+        <!-- Logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
 
         <!-- Components -->
         <dependency>

Modified: trunk/spring-richclient/src/site/site.xml
===================================================================
--- trunk/spring-richclient/src/site/site.xml   2007-04-16 14:15:14 UTC (rev 
1745)
+++ trunk/spring-richclient/src/site/site.xml   2007-04-18 09:53:50 UTC (rev 
1746)
@@ -3,7 +3,7 @@
     <skin>
         <groupId>org.springframework.maven.skins</groupId>
         <artifactId>maven-spring-skin</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
     </skin>
     <bannerLeft>
         <name>${project.name}</name>

Modified: trunk/spring-richclient/vldocking/pom.xml
===================================================================
--- trunk/spring-richclient/vldocking/pom.xml   2007-04-16 14:15:14 UTC (rev 
1745)
+++ trunk/spring-richclient/vldocking/pom.xml   2007-04-18 09:53:50 UTC (rev 
1746)
@@ -10,6 +10,7 @@
     <name>Spring richclient vldocking</name>
     <packaging>jar</packaging>
     <dependencies>
+        <!-- Internal -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -22,7 +23,14 @@
             <groupId>org.springframework.richclient</groupId>
             <artifactId>spring-richclient-sandbox</artifactId>
         </dependency>
+        
+        <!-- Logging -->
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
+        <dependency>
             <groupId>com.vlsolutions</groupId>
             <artifactId>vldocking</artifactId>
         </dependency>


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
spring-rich-c-cvs mailing list
spring-rich-c-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs

Reply via email to