juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r1048885 [2/2] - in /juddi/trunk: ./ juddi-client/ juddi-client/src/main/java/org/apache/juddi/v3/annotations/ juddi-client/src/main/java/org/apache/juddi/v3/client/ juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-client...
Date Tue, 14 Dec 2010 01:07:49 GMT
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Tue Dec 14 01:07:45 2010
@@ -24,6 +24,8 @@ import java.util.List;
 import javax.xml.bind.JAXBException;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.config.AppConfig;
 import org.apache.juddi.config.Property;
 import org.apache.juddi.jaxb.JAXBMarshaller;
@@ -32,7 +34,6 @@ import org.apache.juddi.model.UddiEntity
 import org.apache.juddi.subscription.TypeConvertor;
 import org.apache.juddi.v3.error.ErrorMessage;
 import org.apache.juddi.v3.error.FatalErrorException;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.CompletionStatus;
 import org.uddi.api_v3.OperationalInfo;
 import org.uddi.sub_v3.SubscriptionFilter;
@@ -43,7 +44,7 @@ import org.uddi.v3_service.DispositionRe
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  */
 public class MappingModelToApi {
-	private static Logger logger = Logger.getLogger(MappingModelToApi.class);
+	private static Log logger = LogFactory.getLog(MappingModelToApi.class);
 
 	
 	public static void mapPublisher(org.apache.juddi.model.Publisher modelPublisher, 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java Tue Dec 14 01:07:45 2010
@@ -21,8 +21,9 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
-import org.apache.log4j.Logger;
 
 /**
  * 
@@ -32,7 +33,7 @@ import org.apache.log4j.Logger;
  */
 public class DeletePublisherAssertionByBusinessQuery extends PublisherAssertionQuery {
 
-	private static Logger log = Logger.getLogger(DeletePublisherAssertionByBusinessQuery.class);
+	private static Log log = LogFactory.getLog(DeletePublisherAssertionByBusinessQuery.class);
 
 	public static int delete(EntityManager em, List<?> businessKeys) {
 		if ((businessKeys == null) || (businessKeys.size() == 0))

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java Tue Dec 14 01:07:45 2010
@@ -24,17 +24,18 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.uddi.api_v3.ListDescription;
 import org.apache.juddi.config.AppConfig;
 import org.apache.juddi.config.Property;
 import org.apache.juddi.query.util.DynamicQuery;
-import org.apache.log4j.Logger;
 
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
  */
 public abstract class EntityQuery {
-	private static Logger log = Logger.getLogger(EntityQuery.class);
+	private static Log log = LogFactory.getLog(EntityQuery.class);
 
 	public static final String KEY_NAME = "entityKey";
 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java Tue Dec 14 01:07:45 2010
@@ -21,9 +21,10 @@ import java.util.Collections;
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.v3_service.DispositionReportFaultMessage;
 import org.uddi.api_v3.ListDescription;
 
@@ -40,7 +41,7 @@ import org.uddi.api_v3.ListDescription;
  */
 public class FetchBindingTemplatesQuery extends BindingTemplateQuery {
 
-	private static Logger log = Logger.getLogger(FetchBindingTemplatesQuery.class);
+	private static Log log = LogFactory.getLog(FetchBindingTemplatesQuery.class);
 
 	protected static String selectSQL;
 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java Tue Dec 14 01:07:45 2010
@@ -21,9 +21,10 @@ import java.util.Collections;
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.v3_service.DispositionReportFaultMessage;
 import org.uddi.api_v3.ListDescription;
 
@@ -40,7 +41,7 @@ import org.uddi.api_v3.ListDescription;
  */
 public class FetchBusinessEntitiesQuery extends BusinessEntityQuery {
 
-	private static Logger log = Logger.getLogger(FetchBusinessEntitiesQuery.class);
+	private static Log log = LogFactory.getLog(FetchBusinessEntitiesQuery.class);
 
 	protected static String selectSQL;
 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java Tue Dec 14 01:07:45 2010
@@ -21,9 +21,10 @@ import java.util.Collections;
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.v3_service.DispositionReportFaultMessage;
 import org.uddi.api_v3.ListDescription;
 
@@ -40,7 +41,7 @@ import org.uddi.api_v3.ListDescription;
  */
 public class FetchBusinessServicesQuery extends BusinessServiceQuery {
 
-	private static Logger log = Logger.getLogger(FetchBusinessServicesQuery.class);
+	private static Log log = LogFactory.getLog(FetchBusinessServicesQuery.class);
 
 	protected static String selectSQL;
 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java Tue Dec 14 01:07:45 2010
@@ -21,9 +21,10 @@ import java.util.Collections;
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.v3_service.DispositionReportFaultMessage;
 import org.uddi.api_v3.ListDescription;
 
@@ -40,7 +41,7 @@ import org.uddi.api_v3.ListDescription;
  */
 public class FetchTModelsQuery extends TModelQuery {
 
-	private static Logger log = Logger.getLogger(FetchTModelsQuery.class);
+	private static Log log = LogFactory.getLog(FetchTModelsQuery.class);
 
 	protected static String selectSQL;
 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java Tue Dec 14 01:07:45 2010
@@ -20,9 +20,10 @@ package org.apache.juddi.query;
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.TModelBag;
 
 /**
@@ -49,7 +50,7 @@ import org.uddi.api_v3.TModelBag;
 public class FindBindingByTModelKeyQuery extends BindingTemplateQuery {
 	
 	@SuppressWarnings("unused")
-	private static Logger log = Logger.getLogger(FindBindingByTModelKeyQuery.class);
+	private static Log log = LogFactory.getLog(FindBindingByTModelKeyQuery.class);
 
 	public static final String ENTITY_NAME_CHILD = "TmodelInstanceInfo";
 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java Tue Dec 14 01:07:45 2010
@@ -20,9 +20,10 @@ package org.apache.juddi.query;
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.DiscoveryURLs;
 import org.uddi.api_v3.DiscoveryURL;
 
@@ -43,7 +44,7 @@ import org.uddi.api_v3.DiscoveryURL;
 public class FindBusinessByDiscoveryURLQuery extends BusinessEntityQuery {
 
 	@SuppressWarnings("unused")
-	private static Logger log = Logger.getLogger(FindBusinessByDiscoveryURLQuery.class);
+	private static Log log = LogFactory.getLog(FindBusinessByDiscoveryURLQuery.class);
 
 	private static final String ENTITY_NAME_CHILD = "DiscoveryUrl";
 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java Tue Dec 14 01:07:45 2010
@@ -20,9 +20,10 @@ package org.apache.juddi.query;
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.TModelBag;
 
 /**
@@ -49,7 +50,7 @@ import org.uddi.api_v3.TModelBag;
 public class FindBusinessByTModelKeyQuery extends BusinessEntityQuery {
 	
 	@SuppressWarnings("unused")
-	private static Logger log = Logger.getLogger(FindBusinessByTModelKeyQuery.class);
+	private static Log log = LogFactory.getLog(FindBusinessByTModelKeyQuery.class);
 
 	public static final String ENTITY_NAME_CHILD = "TmodelInstanceInfo";
 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java Tue Dec 14 01:07:45 2010
@@ -18,18 +18,19 @@
 package org.apache.juddi.query;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Collections;
 import java.util.Set;
 
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.config.Constants;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
 import org.apache.juddi.query.util.KeyedRefGroupTModelComparator;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.CategoryBag;
 import org.uddi.api_v3.KeyedReference;
 import org.uddi.api_v3.KeyedReferenceGroup;
@@ -53,7 +54,7 @@ import org.uddi.api_v3.KeyedReferenceGro
 public class FindEntityByCategoryGroupQuery extends EntityQuery {
 	
 	@SuppressWarnings("unused")
-	private Logger log = Logger.getLogger(FindEntityByCategoryGroupQuery.class);
+	private static Log log = LogFactory.getLog(FindEntityByCategoryGroupQuery.class);
 
 	private static final String ENTITY_KEYEDREFERENCEGROUP = "KeyedReferenceGroup";
 	private static final String ALIAS_KEYEDREFERENCEGROUP = "krg";

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java Tue Dec 14 01:07:45 2010
@@ -18,15 +18,17 @@
 package org.apache.juddi.query;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
+
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.config.Constants;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
 import org.apache.juddi.query.util.KeyedRefTModelComparator;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.CategoryBag;
 import org.uddi.api_v3.KeyedReference;
 
@@ -49,7 +51,7 @@ import org.uddi.api_v3.KeyedReference;
 public class FindEntityByCategoryQuery extends EntityQuery {
 	
 	@SuppressWarnings("unused")
-	private Logger log = Logger.getLogger(FindEntityByCategoryQuery.class);
+	private static Log log = LogFactory.getLog(FindEntityByCategoryQuery.class);
 
 	private static final String ENTITY_KEYEDREFERENCE = "KeyedReference";
 	private static final String ALIAS_KEYEDREFERENCE = buildAlias(ENTITY_KEYEDREFERENCE);

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java Tue Dec 14 01:07:45 2010
@@ -17,15 +17,17 @@
 
 package org.apache.juddi.query;
 
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
+
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.config.Constants;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
 import org.apache.juddi.query.util.KeyedRefTModelComparator;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.IdentifierBag;
 import org.uddi.api_v3.KeyedReference;
 
@@ -48,7 +50,7 @@ import org.uddi.api_v3.KeyedReference;
 public class FindEntityByIdentifierQuery extends EntityQuery {
 	
 	@SuppressWarnings("unused")
-	private Logger log = Logger.getLogger(FindEntityByIdentifierQuery.class);
+	private static Log log = LogFactory.getLog(FindEntityByIdentifierQuery.class);
 
 	private String entityName;
 	private String entityAlias;

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java Tue Dec 14 01:07:45 2010
@@ -18,11 +18,13 @@
 package org.apache.juddi.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.Name;
 
 /**
@@ -35,7 +37,7 @@ import org.uddi.api_v3.Name;
 public class FindEntityByNamesQuery extends EntityQuery {
 
 	@SuppressWarnings("unused")
-	private Logger log = Logger.getLogger(FindEntityByNamesQuery.class);
+	private static Log log = LogFactory.getLog(FindEntityByNamesQuery.class);
 
 	private String entityName;
 	private String entityAlias;

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java Tue Dec 14 01:07:45 2010
@@ -18,12 +18,14 @@
 package org.apache.juddi.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.apache.juddi.query.util.DynamicQuery;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.model.PublisherAssertion;
+import org.apache.juddi.query.util.DynamicQuery;
 import org.uddi.api_v3.CompletionStatus;
 
 /**
@@ -34,7 +36,7 @@ import org.uddi.api_v3.CompletionStatus;
  */
 public class FindPublisherAssertionByBusinessQuery extends PublisherAssertionQuery {
 
-	private static Logger log = Logger.getLogger(FindPublisherAssertionByBusinessQuery.class);
+	private static Log log = LogFactory.getLog(FindPublisherAssertionByBusinessQuery.class);
 
 	@SuppressWarnings("unchecked")
 	public static List<PublisherAssertion> select(EntityManager em, List<?> businessKeys, CompletionStatus completionStatus) {

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java Tue Dec 14 01:07:45 2010
@@ -18,11 +18,13 @@
 package org.apache.juddi.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.TModelBag;
 
 /**
@@ -50,7 +52,7 @@ import org.uddi.api_v3.TModelBag;
 public class FindServiceByTModelKeyQuery extends BusinessServiceQuery {
 	
 	@SuppressWarnings("unused")
-	private static Logger log = Logger.getLogger(FindServiceByTModelKeyQuery.class);
+	private static Log log = LogFactory.getLog(FindServiceByTModelKeyQuery.class);
 
 	public static final String ENTITY_NAME_CHILD = "TmodelInstanceInfo";
 

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java Tue Dec 14 01:07:45 2010
@@ -18,11 +18,13 @@
 package org.apache.juddi.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.query.util.DynamicQuery;
 import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.Name;
 
 /**
@@ -47,7 +49,7 @@ import org.uddi.api_v3.Name;
 public class FindTModelByNameQuery extends TModelQuery {
 
 	@SuppressWarnings("unused")
-	private static Logger log = Logger.getLogger(FindTModelByNameQuery.class);
+	private static Log log = LogFactory.getLog(FindTModelByNameQuery.class);
 
 	public static List<?> select(EntityManager em, FindQualifiers fq, Name name, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
 		// If keysIn is not null and empty, then search is over.

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java Tue Dec 14 01:07:45 2010
@@ -19,7 +19,8 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * @author Kurt Stam (kstam@apache.org)
@@ -43,7 +44,7 @@ public class JNDIRegistration
 	private UDDICustodyTransferService custodyTransferService = null;
 	private JUDDIApiService publisherService = null;
 	
-	private Logger log = Logger.getLogger(this.getClass());
+	private Log log = LogFactory.getLog(this.getClass());
 	InitialContext context = null;
 	private static JNDIRegistration registration = null;
 	

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java Tue Dec 14 01:07:45 2010
@@ -33,6 +33,8 @@ import javax.xml.datatype.DatatypeFactor
 import javax.xml.datatype.Duration;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.api.impl.UDDISecurityImpl;
 import org.apache.juddi.api.impl.UDDISubscriptionImpl;
 import org.apache.juddi.api_v3.AccessPointType;
@@ -43,7 +45,6 @@ import org.apache.juddi.model.Subscripti
 import org.apache.juddi.model.UddiEntityPublisher;
 import org.apache.juddi.v3.client.UDDIService;
 import org.apache.juddi.v3.client.UDDIServiceWSDL;
-import org.apache.log4j.Logger;
 import org.uddi.sub_v3.CoveragePeriod;
 import org.uddi.sub_v3.GetSubscriptionResults;
 import org.uddi.sub_v3.SubscriptionResultsList;
@@ -58,7 +59,7 @@ import org.uddi.v3_service.UDDISubscript
  */
 public class SubscriptionNotifier extends TimerTask {
 
-	private Logger log = Logger.getLogger(this.getClass());
+	private Log log = LogFactory.getLog(this.getClass());
 	private Timer timer = null;
 	private long startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default 
 	private long interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java Tue Dec 14 01:07:45 2010
@@ -18,10 +18,11 @@
 package org.apache.juddi.v3.auth;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.ClassUtil;
 import org.apache.juddi.config.AppConfig;
 import org.apache.juddi.config.Property;
-import org.apache.log4j.Logger;
 
 
 /**
@@ -29,7 +30,7 @@ import org.apache.log4j.Logger;
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
  */
 public class AuthenticatorFactory {
-	private static Logger log = Logger.getLogger(AuthenticatorFactory.class);
+	private static Log log = LogFactory.getLog(AuthenticatorFactory.class);
 
 	// Default authenticator implementation
 	private static final String DEFAULT_IMPL = "org.apache.juddi.v3.auth.JUDDIAuthenticator";

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java Tue Dec 14 01:07:45 2010
@@ -28,6 +28,8 @@ import javax.crypto.NoSuchPaddingExcepti
 import javax.xml.bind.JAXBException;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.config.AppConfig;
 import org.apache.juddi.config.Property;
 import org.apache.juddi.cryptor.Cryptor;
@@ -37,14 +39,13 @@ import org.apache.juddi.v3.error.ErrorMe
 import org.apache.juddi.v3.error.FatalErrorException;
 import org.apache.juddi.v3.error.RegistryException;
 import org.apache.juddi.v3.error.UnknownUserException;
-import org.apache.log4j.Logger;
 
 /**
  * @author Anou Manavalan
  */
 public class CryptedXMLDocAuthenticator extends XMLDocAuthenticator {
 	
-	private Logger logger = Logger.getLogger(this.getClass());
+	private Log logger = LogFactory.getLog(this.getClass());
 	/**
 	 * @throws IOException
 	 * @throws JAXBException

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java Tue Dec 14 01:07:45 2010
@@ -20,13 +20,14 @@ package org.apache.juddi.v3.auth;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 
-import org.apache.juddi.model.Publisher;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.config.PersistenceManager;
+import org.apache.juddi.model.Publisher;
 import org.apache.juddi.model.UddiEntityPublisher;
 import org.apache.juddi.v3.error.AuthenticationException;
 import org.apache.juddi.v3.error.ErrorMessage;
 import org.apache.juddi.v3.error.UnknownUserException;
-import org.apache.log4j.Logger;
 
 /**
  * This is the default implementation of jUDDI's Authenticator interface, which
@@ -39,7 +40,7 @@ import org.apache.log4j.Logger;
  */
 public class JUDDIAuthenticator implements Authenticator {
 	
-	private Logger log = Logger.getLogger(this.getClass());
+	private Log log = LogFactory.getLog(this.getClass());
 	/**
 	 * 
 	 * @return the userId that came in on the request providing the user has a publishing account in jUDDI.

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java Tue Dec 14 01:07:45 2010
@@ -24,6 +24,9 @@ import javax.naming.ldap.LdapContext;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.config.AppConfig;
 import org.apache.juddi.config.PersistenceManager;
 import org.apache.juddi.config.Property;
@@ -33,9 +36,6 @@ import org.apache.juddi.v3.error.Authent
 import org.apache.juddi.v3.error.ErrorMessage;
 import org.apache.juddi.v3.error.FatalErrorException;
 import org.apache.juddi.v3.error.UnknownUserException;
-import org.apache.log4j.Logger;
-
-import org.apache.commons.configuration.ConfigurationException;
 
 /**
  * This is a implementation of jUDDI's Authenticator interface, that uses the
@@ -64,7 +64,7 @@ import org.apache.commons.configuration.
  */
 public class LdapSimpleAuthenticator implements Authenticator {
 
-    private Logger log = Logger.getLogger(this.getClass());
+	private Log log = LogFactory.getLog(this.getClass());
 
     private LdapContext ctx = null;
     private Hashtable<String, String> env = null;

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java Tue Dec 14 01:07:45 2010
@@ -28,6 +28,9 @@ import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.ClassUtil;
 import org.apache.juddi.config.AppConfig;
 import org.apache.juddi.config.Property;
 import org.apache.juddi.model.UddiEntityPublisher;
@@ -35,8 +38,6 @@ import org.apache.juddi.v3.error.Authent
 import org.apache.juddi.v3.error.ErrorMessage;
 import org.apache.juddi.v3.error.FatalErrorException;
 import org.apache.juddi.v3.error.UnknownUserException;
-import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.Loader;
 
 /**
  * This is a simple implementation of jUDDI's Authenticator interface. The credential
@@ -59,7 +60,7 @@ import org.apache.log4j.helpers.Loader;
  */
 public class XMLDocAuthenticator implements Authenticator
 {
-	private static Logger log = Logger.getLogger(AuthenticatorFactory.class);
+	private static Log log = LogFactory.getLog(AuthenticatorFactory.class);
 	/** Container for the user credentials */
 	Hashtable<String,User> userTable;
 	
@@ -85,7 +86,7 @@ public class XMLDocAuthenticator impleme
 		userTable = new Hashtable<String,User>();
 		String usersFileName = getFilename();
 		log.info("Reading jUDDI Users File: " + usersFileName + "...");
-		InputStream stream = Loader.getResource(usersFileName).openStream();
+		InputStream stream = ClassUtil.getResource(usersFileName, this.getClass()).openStream();
 		JAXBContext jaxbContext=JAXBContext.newInstance(JuddiUsers.class);
 		Unmarshaller unMarshaller = jaxbContext.createUnmarshaller();
 		JAXBElement<JuddiUsers> element = unMarshaller.unmarshal(new StreamSource(stream),JuddiUsers.class);

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java Tue Dec 14 01:07:45 2010
@@ -25,6 +25,8 @@ import javax.xml.ws.Holder;
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.api_v3.DeletePublisher;
 import org.apache.juddi.api_v3.SavePublisher;
 import org.apache.juddi.config.AppConfig;
@@ -43,7 +45,6 @@ import org.apache.juddi.v3.error.Invalid
 import org.apache.juddi.v3.error.KeyUnavailableException;
 import org.apache.juddi.v3.error.UserMismatchException;
 import org.apache.juddi.v3.error.ValueNotAllowedException;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.AddPublisherAssertions;
 import org.uddi.api_v3.DeleteBinding;
 import org.uddi.api_v3.DeleteBusiness;
@@ -67,7 +68,7 @@ import org.uddi.v3_service.DispositionRe
  */
 public class ValidatePublish extends ValidateUDDIApi {
 
-	Logger log = Logger.getLogger(this.getClass());
+	private Log log = LogFactory.getLog(this.getClass());
 	
 	public ValidatePublish(UddiEntityPublisher publisher) {
 		super(publisher);

Modified: juddi/trunk/juddiv3-war/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/pom.xml?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/pom.xml (original)
+++ juddi/trunk/juddiv3-war/pom.xml Tue Dec 14 01:07:45 2010
@@ -137,19 +137,7 @@
 		<dependency>
 			<groupId>commons-configuration</groupId>
 			<artifactId>commons-configuration</artifactId>
-			<version>1.5</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-collections</groupId>
-					<artifactId>commons-collections</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.13</version>
-			<scope>provided</scope>
+			<version>1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>

Modified: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/NotifyServlet.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/NotifyServlet.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/NotifyServlet.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/NotifyServlet.java Tue Dec 14 01:07:45 2010
@@ -45,7 +45,7 @@ public class NotifyServlet extends HttpS
 		StringBuffer sb = new StringBuffer();
 
 		Buffer nl = NotificationList.getInstance().getNotifications();
-		Iterator it = nl.iterator();
+		Iterator<String> it = nl.iterator();
 		while (it.hasNext()) {
 			String notification = (String) it.next();		
 			sb.append(notification);

Modified: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/RegistryServlet.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/RegistryServlet.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/RegistryServlet.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/RegistryServlet.java Tue Dec 14 01:07:45 2010
@@ -20,8 +20,9 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.Registry;
-import org.apache.log4j.Logger;
 
 /**
  * This servlet is ONLY used to initialize the jUDDI webapp on startup and
@@ -32,7 +33,7 @@ import org.apache.log4j.Logger;
 public class RegistryServlet extends HttpServlet {
 	
 	private static final long serialVersionUID = 4653310291840334765L;
-	private static Logger logger = Logger.getLogger(RegistryServlet.class);
+	private static Log logger = LogFactory.getLog(RegistryServlet.class);
 
 	/**
 	 * Create the shared instance of jUDDI's Registry class and call it's

Modified: juddi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/pom.xml?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/pom.xml (original)
+++ juddi/trunk/pom.xml Tue Dec 14 01:07:45 2010
@@ -256,7 +256,27 @@
 			<url>scpexe://people.apache.org/www/juddi.apache.org/</url>
 		</site>
 	</distributionManagement>
-	<dependencies />
+	<dependencies>
+	<!-- 
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.13</version>
+			<scope>test</scope>
+		</dependency>
+		 -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.5</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging-api</artifactId>
+			<version>1.1</version>
+		</dependency>
+	</dependencies>
 	<repositories>
 		<repository>
 			<id>maven2-repository.dev.java.net</id>

Modified: juddi/trunk/uddi-tck-base/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/pom.xml?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/pom.xml (original)
+++ juddi/trunk/uddi-tck-base/pom.xml Tue Dec 14 01:07:45 2010
@@ -31,11 +31,6 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.13</version>
-		</dependency>
-		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.5</version>

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBindingTemplate.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBindingTemplate.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBindingTemplate.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBindingTemplate.java Tue Dec 14 01:07:45 2010
@@ -18,8 +18,9 @@ import static junit.framework.Assert.ass
 
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.uddi.api_v3.BindingDetail;
 import org.uddi.api_v3.BindingTemplate;
@@ -37,7 +38,7 @@ public class TckBindingTemplate 
 	final static String JOE_BINDING_XML               = "uddi_data/joepublisher/bindingTemplate.xml";
     final static String JOE_BINDING_KEY               = "uddi:uddi.joepublisher.com:bindingtwo";
   
-	private Logger logger = Logger.getLogger(this.getClass());
+	private Log logger = LogFactory.getLog(this.getClass());
 	private UDDIPublicationPortType publication = null;
     private UDDIInquiryPortType inquiry = null;
 	

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java Tue Dec 14 01:07:45 2010
@@ -19,8 +19,9 @@ import static junit.framework.Assert.ass
 
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.uddi.api_v3.BusinessDetail;
 import org.uddi.api_v3.BusinessEntity;
@@ -44,7 +45,7 @@ public class TckBusiness 
     final static String SAM_BUSINESS_WITHPROJECTION_XML = "uddi_data/samsyndicator/businessEntity_withProjection.xml";
     final static String SAM_BUSINESS_KEY        = "uddi:www.samco.com:samco";
     
-	private Logger logger = Logger.getLogger(this.getClass());
+    private Log logger = LogFactory.getLog(this.getClass());
 	private UDDIPublicationPortType publication = null;
     private UDDIInquiryPortType inquiry = null;
 	

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java Tue Dec 14 01:07:45 2010
@@ -18,8 +18,9 @@ import static junit.framework.Assert.ass
 
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.uddi.api_v3.BusinessService;
 import org.uddi.api_v3.DeleteService;
@@ -45,7 +46,7 @@ public class TckBusinessService 
     final static String SAM_SERVICE_XML              = "uddi_data/samsyndicator/businessService.xml";
     final static String SAM_SERVICE_KEY              = "uddi:www.samco.com:listingservice";
    
-	private Logger logger = Logger.getLogger(this.getClass());
+    private Log logger = LogFactory.getLog(this.getClass());
 	private UDDIPublicationPortType publication = null;
     private UDDIInquiryPortType inquiry = null;
 	

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java Tue Dec 14 01:07:45 2010
@@ -22,8 +22,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.uddi.api_v3.BindingDetail;
 import org.uddi.api_v3.BindingTemplate;
@@ -71,7 +72,7 @@ public class TckFindEntity 
 	final static String FIND_BINDING_XML              = "uddi_data/find/findBinding1.xml";
 	final static String FIND_TMODEL_XML               = "uddi_data/find/findTModel1.xml";
    
-	private Logger logger = Logger.getLogger(this.getClass());
+	private Log logger = LogFactory.getLog(this.getClass());
 	UDDIInquiryPortType inquiry =null;
 	
 	public TckFindEntity(UDDIInquiryPortType inquiry) {

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java Tue Dec 14 01:07:45 2010
@@ -18,8 +18,9 @@ import static junit.framework.Assert.ass
 
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.uddi.api_v3.AddPublisherAssertions;
 import org.uddi.api_v3.DeletePublisherAssertions;
@@ -37,7 +38,7 @@ public class TckPublisherAssertion 
 	final static String JOE_ASSERT2_XML    = "uddi_data/joepublisher/publisherAssertion2.xml";
 	final static String SAM_ASSERT_XML    = "uddi_data/samsyndicator/publisherAssertion.xml";
 	
-	private Logger logger = Logger.getLogger(this.getClass());
+	private Log logger = LogFactory.getLog(this.getClass());
 	private UDDIPublicationPortType publication = null;
  
 	public TckPublisherAssertion(UDDIPublicationPortType publication) {

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java Tue Dec 14 01:07:45 2010
@@ -19,8 +19,9 @@ import java.util.List;
 
 import javax.xml.ws.Holder;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.uddi.api_v3.BusinessDetail;
 import org.uddi.api_v3.BusinessEntity;
@@ -63,8 +64,7 @@ public class TckSubscription 
     final static String SAM_SUBSCRIPTION3_KEY = "uddi:www.samco.com:subscriptionthree";
 	final static String SAM_SUBSCRIPTIONRESULTS3_XML = "uddi_data/subscription/subscriptionresults4.xml";
 	
-	
-	private Logger logger = Logger.getLogger(this.getClass());
+	private Log logger = LogFactory.getLog(this.getClass());
     UDDISubscriptionPortType subscription = null;
 	UDDISecurityPortType security = null;
 	

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java Tue Dec 14 01:07:45 2010
@@ -21,8 +21,9 @@ import java.util.List;
 
 import javax.xml.ws.Holder;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.uddi.api_v3.BindingTemplate;
 import org.uddi.api_v3.DeleteBinding;
@@ -57,7 +58,7 @@ public class TckSubscriptionListener
 	public final static String SUBSCRIPTION_XML = "uddi_data/subscriptionnotifier/subscription1.xml";
     public final static String SUBSCRIPTION_KEY = "uddi:uddi.joepublisher.com:subscriptionone";
     
-	private Logger logger = Logger.getLogger(this.getClass());
+    private Log logger = LogFactory.getLog(this.getClass());
 	private UDDIPublicationPortType publication = null;
     private UDDISubscriptionPortType subscription = null;
     private SaveService ss = null;

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java Tue Dec 14 01:07:45 2010
@@ -18,8 +18,9 @@ import static junit.framework.Assert.ass
 
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.uddi.api_v3.DeleteTModel;
 import org.uddi.api_v3.GetTModelDetail;
@@ -41,8 +42,7 @@ public class TckTModel 
     final static String SAM_SYNDICATOR_TMODEL_XML     = "uddi_data/samsyndicator/tModelKeyGen.xml";
     final static String SAM_SYNDICATOR_TMODEL_KEY     = "uddi:www.samco.com:keygenerator";
  
-    
-	private Logger logger = Logger.getLogger(this.getClass());
+    private Log logger = LogFactory.getLog(this.getClass());
 	private UDDIPublicationPortType publication = null;
     private UDDIInquiryPortType inquiry = null;
 	

Modified: juddi/trunk/uddi-tck/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/pom.xml?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/pom.xml (original)
+++ juddi/trunk/uddi-tck/pom.xml Tue Dec 14 01:07:45 2010
@@ -32,27 +32,6 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>commons-configuration</groupId>
-			<artifactId>commons-configuration</artifactId>
-			<version>1.5</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.13</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.5</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>uddi-tck-base</artifactId>
 			<version>${project.parent.version}</version>

Modified: juddi/trunk/uddi-ws/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/pom.xml?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/pom.xml (original)
+++ juddi/trunk/uddi-ws/pom.xml Tue Dec 14 01:07:45 2010
@@ -69,16 +69,5 @@
 			<artifactId>jaxb-impl</artifactId>
 			<version>2.1.9</version>
 		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.13</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.5</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file

Modified: juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java Tue Dec 14 01:07:45 2010
@@ -29,11 +29,12 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class EntityCreator {
 
-	private static Logger logger = Logger.getLogger(EntityCreator.class);
+	private static Log logger = LogFactory.getLog(EntityCreator.class);
 	
 	@SuppressWarnings("rawtypes")
 	public static Object buildFromDoc(String fileName, String thePackage) throws JAXBException, IOException {

Modified: juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java Tue Dec 14 01:07:45 2010
@@ -30,14 +30,15 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Element;
 
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
  */
 public class JAXBMarshaller {
-	private static Logger logger = Logger.getLogger(JAXBMarshaller.class);
+	private static Log logger = LogFactory.getLog(JAXBMarshaller.class);
 	
 	public static final String PACKAGE_UDDIAPI = "org.uddi.api_v3";
 	public static final String PACKAGE_SUBSCRIPTION = "org.uddi.sub_v3";

Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java Tue Dec 14 01:07:45 2010
@@ -3,14 +3,15 @@ package org.uddi;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class JAXBContextUtil {
 
-	private static Logger log = Logger.getLogger(JAXBContextUtil.class);
+	private static Log log = LogFactory.getLog(JAXBContextUtil.class);
 	private static final Map<String, JAXBContext> JAXBContexts = new HashMap<String, JAXBContext>();
 
 	public static JAXBContext getContext(String packageName) throws JAXBException {

Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/DispositionReportFaultMessage.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/DispositionReportFaultMessage.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/DispositionReportFaultMessage.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/DispositionReportFaultMessage.java Tue Dec 14 01:07:45 2010
@@ -26,7 +26,8 @@ import javax.xml.soap.Detail;
 import javax.xml.ws.WebFault;
 import javax.xml.ws.soap.SOAPFaultException;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.uddi.api_v3.DispositionReport;
 
 
@@ -41,7 +42,7 @@ public class DispositionReportFaultMessa
     extends RemoteException
 {
 	private static final long serialVersionUID = -3901821587689888649L;
-	private static transient Logger log = Logger.getLogger(DispositionReportFaultMessage.class);
+	private static transient Log log = LogFactory.getLog(DispositionReportFaultMessage.class);
 	/**
      * Java type that goes as soapenv:Fault detail element.
      * 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


Mime
View raw message