directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcon...@apache.org
Subject svn commit: r501208 - in /directory/sandbox/jconlon/osgi-services/configuration-service: ./ src/test/java/org/apache/configuration/ src/test/java/org/apache/configuration/impl/ src/test/resources/
Date Mon, 29 Jan 2007 22:36:22 GMT
Author: jconlon
Date: Mon Jan 29 14:36:21 2007
New Revision: 501208

URL: http://svn.apache.org/viewvc?view=rev&rev=501208
Log:
Refactored tests to new dir. Upgraded slf4j logging.

Added:
    directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationAdminImplTest.java
      - copied, changed from r501176, directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationAdminImplTest.java
    directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationImplTest.java
      - copied, changed from r501176, directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationImplTest.java
Removed:
    directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationAdminImplTest.java
    directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationImplTest.java
    directory/sandbox/jconlon/osgi-services/configuration-service/src/test/resources/logback.xml
Modified:
    directory/sandbox/jconlon/osgi-services/configuration-service/pom.xml
    directory/sandbox/jconlon/osgi-services/configuration-service/src/test/resources/log4j.properties

Modified: directory/sandbox/jconlon/osgi-services/configuration-service/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-services/configuration-service/pom.xml?view=diff&rev=501208&r1=501207&r2=501208
==============================================================================
--- directory/sandbox/jconlon/osgi-services/configuration-service/pom.xml (original)
+++ directory/sandbox/jconlon/osgi-services/configuration-service/pom.xml Mon Jan 29 14:36:21
2007
@@ -40,9 +40,7 @@
 		</plugins>
 	</build>
 	<dependencies>
-	    
-		
-		
+	    
 		<!-- For the OSGi interfaces. -->
 		<dependency>
 			<groupId>org.apache.felix</groupId>
@@ -77,83 +75,46 @@
   			<version>3.2</version>
   			<scope>provided</scope>
   		</dependency>
-  		
-		<!-- To be removed. 
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.servicebinder</artifactId>
-			<version>0.8.0-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>-->
-		
-		
-		
-		
-		 
-  
-        <!-- To be replaced with logback -->
+  		
 		<dependency>
 			<groupId>org.slf4j</groupId>
-			<artifactId>nlog4j</artifactId>
-			<version>1.2.25</version>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>xerces</groupId>
-					<artifactId>xerces</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.mail</groupId>
-					<artifactId>mail</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.activation</groupId>
-					<artifactId>activation</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>checkstyle</groupId>
-					<artifactId>checkstyle</artifactId>
-				</exclusion>
-			</exclusions>
+			<artifactId>jcl104-over-slf4j</artifactId>
+			<version>1.2</version>
+			<scope>test</scope>
 		</dependency>
-		 
 		
+		<!--  Replaced nlog4 logging with these deps.-->
 		<dependency>
 			<groupId>org.slf4j</groupId>
-			<artifactId>jcl104-over-slf4j</artifactId>
+			<artifactId>slf4j-api</artifactId>
 			<version>1.2</version>
 			<scope>test</scope>
 		</dependency>
-		
-		<!--  Will replace logging with these deps.
 		<dependency>
 			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
+			<artifactId>slf4j-log4j12</artifactId>
 			<version>1.2</version>
 			<scope>test</scope>
 		</dependency>
+		
+		<dependency>
+      		<groupId>log4j</groupId>
+      		<artifactId>log4j</artifactId>
+      		<version>1.2.13</version>
+      		<scope>test</scope>
+		</dependency>
+		<!--  
+		
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.8.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.8.1</version>
 			<scope>test</scope>
 		</dependency>
 		-->

Copied: directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationAdminImplTest.java
(from r501176, directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationAdminImplTest.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationAdminImplTest.java?view=diff&rev=501208&p1=directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationAdminImplTest.java&r1=501176&p2=directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationAdminImplTest.java&r2=501208
==============================================================================
--- directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationAdminImplTest.java
(original)
+++ directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationAdminImplTest.java
Mon Jan 29 14:36:21 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.configuration;
+package org.apache.configuration.impl;
 
 import java.io.File;
 import java.io.IOException;

Copied: directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationImplTest.java
(from r501176, directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationImplTest.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationImplTest.java?view=diff&rev=501208&p1=directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationImplTest.java&r1=501176&p2=directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationImplTest.java&r2=501208
==============================================================================
--- directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/ConfigurationImplTest.java
(original)
+++ directory/sandbox/jconlon/osgi-services/configuration-service/src/test/java/org/apache/configuration/impl/ConfigurationImplTest.java
Mon Jan 29 14:36:21 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.configuration;
+package org.apache.configuration.impl;
 
 
 import java.io.File;

Modified: directory/sandbox/jconlon/osgi-services/configuration-service/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-services/configuration-service/src/test/resources/log4j.properties?view=diff&rev=501208&r1=501207&r2=501208
==============================================================================
--- directory/sandbox/jconlon/osgi-services/configuration-service/src/test/resources/log4j.properties
(original)
+++ directory/sandbox/jconlon/osgi-services/configuration-service/src/test/resources/log4j.properties
Mon Jan 29 14:36:21 2007
@@ -7,24 +7,16 @@
 
 # Test infrastructure classes that use logging
 log4j.category.org.apache.directory.server.core.partition.impl.btree=ERROR
-#log4j.category.org.apache.directory.osgi.backend=DEBUG
 log4j.category.org.apache.directory.server.core=ERROR
 log4j.category.org.apache.directory.server.core.schema.bootstrap=ERROR
-#log4j.category.org.apache.directory.server.protocol.shared.store=DEBUG
 
 
 # Production classes that use logging
-log4j.category.org.apache.configuration.osgi.impl.ConfigurationAdminImpl=DEBUG
-log4j.category.org.apache.configuration.osgi.impl.ConfigurationAdminImplTest=DEBUG
-log4j.category.org.apache.configuration.osgi.impl.ConfigurationImplTest=INFO
-
-log4j.category.org.apache.configuration.dao.DaoConfigurationStore=DEBUG
-log4j.category.org.apache.configuration.dao.DaoConfigurationStoreTest=INFO
-
-log4j.category.org.apache.configuration.dao.jndi.impl.JndiConfigurationDaoNotifierImpl=ERROR
-#log4j.category.org.apache.configuration.dao.jndi.impl.IntegrationTest=ERROR
-#log4j.category.org.apache.configuration.dao.jndi.impl.UpdateDirCommand=ERROR 
-#log4j.category.org.apache.configuration.dao.jndi.impl.ListDirCommand=ERROR 
+log4j.category.org.apache.configuration.dao=ERROR
+log4j.category.org.apache.configuration.dao.jndi=ERROR
+log4j.category.org.apache.configuration.dao.jndi.impl=ERROR
+log4j.category.org.apache.configuration.event=ERROR
+log4j.category.org.apache.configuration.impl=ERROR
 
 # Console Appender
 log4j.appender.console=org.apache.log4j.ConsoleAppender



Mime
View raw message