You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2010/12/14 02:07:49 UTC
svn commit: r1048885 [1/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...
Author: kstam
Date: Tue Dec 14 01:07:45 2010
New Revision: 1048885
URL: http://svn.apache.org/viewvc?rev=1048885&view=rev
Log:
JUDDI-436, switching from log4j to commons.logging.
Modified:
juddi/trunk/juddi-client/pom.xml
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ClassUtil.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/TokenResolver.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/annotations/AnnotationTest.java
juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch
juddi/trunk/juddi-core-openjpa/pom.xml
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/keygen/KeyGeneratorTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
juddi/trunk/juddi-core/pom.xml
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/ClassUtil.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PersistenceManager.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PublisherFileFilter.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
juddi/trunk/juddiv3-war/pom.xml
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/NotifyServlet.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/servlets/RegistryServlet.java
juddi/trunk/pom.xml
juddi/trunk/uddi-tck-base/pom.xml
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBindingTemplate.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
juddi/trunk/uddi-tck/pom.xml
juddi/trunk/uddi-ws/pom.xml
juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java
juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/DispositionReportFaultMessage.java
Modified: juddi/trunk/juddi-client/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/pom.xml?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/pom.xml (original)
+++ juddi/trunk/juddi-client/pom.xml Tue Dec 14 01:07:45 2010
@@ -31,37 +31,15 @@
<artifactId>uddi-ws</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <!-- not sure why maven does not figure this out by itself -->
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
+ <version>1.6</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
</dependencies>
</project>
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java Tue Dec 14 01:07:45 2010
@@ -22,10 +22,11 @@ import java.util.Properties;
import javax.jws.WebService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api_v3.AccessPointType;
+import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.config.TokenResolver;
-import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.Loader;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
@@ -44,7 +45,7 @@ public class AnnotationProcessor {
private static final String KEY_VALUE="keyValue=";
private static final String TMODEL_KEY="tModelKey=";
- private Logger log = Logger.getLogger(AnnotationProcessor.class);
+ private Log log = LogFactory.getLog(AnnotationProcessor.class);
public Collection<BusinessService> readServiceAnnotations(String[] classesWithAnnotations, Properties properties) {
Collection<BusinessService> services = new ArrayList<BusinessService>();
@@ -62,7 +63,7 @@ public class AnnotationProcessor {
public BusinessService readServiceAnnotations(String classWithAnnotations, Properties properties) throws ClassNotFoundException {
BusinessService service = new BusinessService();
- Class<?> clazz = Loader.loadClass(classWithAnnotations);
+ Class<?> clazz = ClassUtil.forName(classWithAnnotations, this.getClass());
UDDIService uddiService= (UDDIService) clazz.getAnnotation(UDDIService.class);
WebService webServiceAnnotation = (WebService) clazz.getAnnotation(WebService.class);
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ClassUtil.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ClassUtil.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ClassUtil.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ClassUtil.java Tue Dec 14 01:07:45 2010
@@ -16,6 +16,8 @@
*/
package org.apache.juddi.v3.client;
+import java.net.URL;
+
/**
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
@@ -49,4 +51,22 @@ public class ClassUtil {
return Class.forName(name, true, ClassLoader.getSystemClassLoader()) ;
}
+
+ public static URL getResource(String name, Class<?> caller)
+ {
+ ClassLoader threadClassLoader = Thread.currentThread().getContextClassLoader();
+ if (threadClassLoader != null) {
+
+ URL url = threadClassLoader.getResource(name);
+
+ if (url != null)
+ return url;
+
+ }
+
+ ClassLoader callerClassLoader = caller.getClassLoader();
+
+ return callerClassLoader.getResource(name);
+ }
+
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIService.java Tue Dec 14 01:07:45 2010
@@ -25,7 +25,6 @@ import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
import javax.xml.ws.WebServiceFeature;
-import org.apache.log4j.helpers.Loader;
import org.uddi.v3_service.UDDICustodyTransferPortType;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
@@ -51,7 +50,7 @@ public class UDDIService
private final static URL UDDISERVICE_WSDL_LOCATION;
static {
- URL url = Loader.getResource("uddi_v3_service.wsdl");
+ URL url = ClassUtil.getResource("uddi_v3_service.wsdl",UDDIService.class);
UDDISERVICE_WSDL_LOCATION = url;
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIServiceWSDL.java Tue Dec 14 01:07:45 2010
@@ -10,8 +10,6 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.helpers.Loader;
-
public class UDDIServiceWSDL {
/** The WSDLEnpoint Types as defined in the UDDI v3 specification. */
@@ -94,14 +92,14 @@ public class UDDIServiceWSDL {
*/
protected String getServiceWSDLContent() throws IOException
{
- URL serviceWSDLURL = Loader.getResource(getUddiV3ServiceWSDL());
+ URL serviceWSDLURL = ClassUtil.getResource(getUddiV3ServiceWSDL(), this.getClass());
if (serviceWSDLURL==null) throw new IOException("Could not locate resource " + getUddiV3ServiceWSDL());
return read(serviceWSDLURL);
}
private void copyImportFiles() throws IOException
{
- URL serviceWSDLURL = Loader.getResource(getUddiV3ServiceWSDL());
+ URL serviceWSDLURL = ClassUtil.getResource(getUddiV3ServiceWSDL(),this.getClass());
if (serviceWSDLURL==null) throw new IOException("Could not locate resource " + getUddiV3ServiceWSDL());
int endIndex = 0;
if (getUddiV3ServiceWSDL().contains(File.separator)) {
@@ -110,7 +108,7 @@ public class UDDIServiceWSDL {
String srcDir = getUddiV3ServiceWSDL().substring(0,endIndex);
String destDir = System.getProperty("java.io.tmpdir");
for (String importFileName : imports) {
- URL url = Loader.getResource(srcDir + importFileName);
+ URL url = ClassUtil.getResource(srcDir + importFileName, this.getClass());
String content = read(url);
File importFile = new File(destDir + File.separator + importFileName);
Writer out = new OutputStreamWriter(new FileOutputStream(importFile));
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java Tue Dec 14 01:07:45 2010
@@ -17,14 +17,14 @@
package org.apache.juddi.v3.client.config;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class BackGroundRegistration implements Runnable {
private UDDIClerkManager manager = null;
- private static Logger log = Logger.getLogger(UDDIClerkManager.class);
+ private static Log log = LogFactory.getLog(BackGroundRegistration.class);
-
public BackGroundRegistration(UDDIClerkManager manager) {
super();
this.manager = manager;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Tue Dec 14 01:07:45 2010
@@ -28,7 +28,8 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.SystemConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Handles the client configuration of the uddi-client. By default it first
@@ -40,7 +41,7 @@ public class ClientConfig
{
private final static String UDDI_CONFIG_FILENAME_PROPERTY = "uddi.client.xml";
public final static String DEFAULT_UDDI_CONFIG = "META-INF/uddi.xml";
- private Logger log = Logger.getLogger(ClientConfig.class);
+ private Log log = LogFactory.getLog(ClientConfig.class);
private Configuration config = null;;
private Map<String,UDDINode> uddiNodes = null;
private Map<String,UDDIClerk> uddiClerks = null;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/TokenResolver.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/TokenResolver.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/TokenResolver.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/TokenResolver.java Tue Dec 14 01:07:45 2010
@@ -20,11 +20,12 @@ import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class TokenResolver {
- private static Logger log = Logger.getLogger(TokenResolver.class);
+ private static Log log = LogFactory.getLog(TokenResolver.class);
public synchronized static String replaceTokens(String string, Properties properties) {
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java Tue Dec 14 01:07:45 2010
@@ -27,6 +27,8 @@ import java.util.Properties;
import javax.xml.ws.soap.SOAPFaultException;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api_v3.Clerk;
import org.apache.juddi.api_v3.ClerkDetail;
import org.apache.juddi.api_v3.Node;
@@ -34,7 +36,6 @@ import org.apache.juddi.api_v3.NodeDetai
import org.apache.juddi.api_v3.SaveClerk;
import org.apache.juddi.api_v3.SaveNode;
import org.apache.juddi.v3.client.transport.TransportException;
-import org.apache.log4j.Logger;
import org.uddi.api_v3.BindingDetail;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessDetail;
@@ -59,7 +60,7 @@ import org.uddi.v3_service.DispositionRe
public class UDDIClerk implements Serializable {
private static final long serialVersionUID = -8597375975981358134L;
- private Logger log = Logger.getLogger(this.getClass());
+ private Log log = LogFactory.getLog(this.getClass());
protected String name;
protected UDDINode uddiNode;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java Tue Dec 14 01:07:45 2010
@@ -23,15 +23,16 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.annotations.AnnotationProcessor;
import org.apache.juddi.v3.client.transport.TransportException;
-import org.apache.log4j.Logger;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessService;
public class UDDIClerkManager {
- private static Logger log = Logger.getLogger(UDDIClerkManager.class);
+ private static Log log = LogFactory.getLog(UDDIClerkManager.class);
private ClientConfig clientConfig = null;
private String CONFIG_FILE = "META-INF/uddi.xml";
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java Tue Dec 14 01:07:45 2010
@@ -19,7 +19,8 @@ import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* This servlet is to initialize the UDDIclient on deployment and
@@ -30,7 +31,7 @@ import org.apache.log4j.Logger;
public class UDDIClerkServlet extends HttpServlet {
private static final long serialVersionUID = -91998529871296125L;
- private Logger logger = Logger.getLogger(UDDIClerkServlet.class);
+ private Log logger = LogFactory.getLog(UDDIClerkServlet.class);
private UDDIClerkManager manager = null;
/**
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java Tue Dec 14 01:07:45 2010
@@ -19,11 +19,12 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class UDDIClientContainer {
- private static Logger log = Logger.getLogger(UDDIClientContainer.class);
+ private static Log log = LogFactory.getLog(UDDIClientContainer.class);
private static Map<String,UDDIClerkManager> managers = new HashMap<String, UDDIClerkManager>();
public static UDDIClerkManager getUDDIClerkManager(String managerName)
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java Tue Dec 14 01:07:45 2010
@@ -20,9 +20,9 @@ import java.io.Serializable;
import java.util.Properties;
import org.apache.juddi.api_v3.Node;
+import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.transport.TransportException;
-import org.apache.log4j.helpers.Loader;
public class UDDINode implements Serializable {
@@ -100,7 +100,7 @@ public class UDDINode implements Seriali
if (transport==null) {
try {
String clazz = getProxyTransport();
- Class<?> transportClass = Loader.loadClass(clazz);
+ Class<?> transportClass = ClassUtil.forName(clazz,this.getClass());
transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(managerName,name);
} catch (Exception e) {
throw new TransportException(e.getMessage(),e);
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java Tue Dec 14 01:07:45 2010
@@ -5,13 +5,14 @@ import java.lang.reflect.InvocationTarge
import javax.servlet.ServletContext;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.log4j.Logger;
public class WebHelper {
- public static Logger logger = Logger.getLogger(WebHelper.class);
+ public static Log logger = LogFactory.getLog(WebHelper.class);
public static final String UDDI_CLIENT_MANAGER_NAME = "uddi.client.manager.name";
public static final String UDDI_CLIENT_CONFIG_FILE = "uddi.client.config.file";
public static final String JUDDI_CLIENT_MANAGER_NAME = "juddi.client.manager.name";
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java Tue Dec 14 01:07:45 2010
@@ -16,14 +16,15 @@
*/
package org.apache.juddi.v3.client.config;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessEntity;
import org.uddi.api_v3.BusinessService;
public class XRegistration {
- private Logger log = Logger.getLogger(this.getClass());
+ private Log log = LogFactory.getLog(this.getClass());
private UDDIClerk toClerk;
private UDDIClerk fromClerk;
private String entityKey;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java Tue Dec 14 01:07:45 2010
@@ -23,11 +23,12 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3_service.JUDDIApiPortType;
-import org.apache.log4j.Logger;
import org.uddi.v3_service.UDDICustodyTransferPortType;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
@@ -39,7 +40,7 @@ import org.uddi.v3_service.UDDISubscript
public class RMITransport extends Transport {
InitialContext context = null;
- private Logger logger = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
private String nodeName = null;
private String managerName = null;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java Tue Dec 14 01:07:45 2010
@@ -26,7 +26,7 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.log4j.helpers.Loader;
+import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
@@ -84,7 +84,7 @@ public class UDDIInquiryService {
public Node inquire(Element uddiReq) throws Exception {
UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null);
String clazz = manager.getClientConfig().getUDDINode(DEFAULT_NODE_NAME).getProxyTransport();
- Class<?> transportClass = Loader.loadClass(clazz);
+ Class<?> transportClass = ClassUtil.forName(clazz,this.getClass());
Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(DEFAULT_NODE_NAME);
UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java Tue Dec 14 01:07:45 2010
@@ -18,10 +18,10 @@ package org.apache.juddi.v3.client.trans
import java.util.HashMap;
+import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.log4j.helpers.Loader;
import org.uddi.api_v3.AddPublisherAssertions;
import org.uddi.api_v3.DeleteBinding;
import org.uddi.api_v3.DeleteBusiness;
@@ -84,7 +84,7 @@ public class UDDIPublicationService {
{
UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null);
String clazz = manager.getClientConfig().getUDDINode(DEFAULT_NODE_NAME).getProxyTransport();
- Class<?> transportClass = Loader.loadClass(clazz);
+ Class<?> transportClass = ClassUtil.forName(clazz, this.getClass());
Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(DEFAULT_NODE_NAME);
UDDIPublicationPortType publish = transport.getUDDIPublishService();
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java Tue Dec 14 01:07:45 2010
@@ -18,10 +18,10 @@ package org.apache.juddi.v3.client.trans
import java.util.HashMap;
+import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.log4j.helpers.Loader;
import org.uddi.v3_service.UDDISecurityPortType;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -60,7 +60,7 @@ public class UDDISecurityService {
{
UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null);
String clazz = manager.getClientConfig().getUDDINode(DEFAULT_NODE_NAME).getProxyTransport();
- Class<?> transportClass = Loader.loadClass(clazz);
+ Class<?> transportClass = ClassUtil.forName(clazz, this.getClass());
Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(DEFAULT_NODE_NAME);
UDDISecurityPortType security = transport.getUDDISecurityService();
Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/annotations/AnnotationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/annotations/AnnotationTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/annotations/AnnotationTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/annotations/AnnotationTest.java Tue Dec 14 01:07:45 2010
@@ -16,7 +16,7 @@ package org.apache.juddi.v3.annotations;
import java.util.Properties;
-import org.apache.log4j.helpers.Loader;
+import org.apache.juddi.v3.client.ClassUtil;
import org.junit.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -52,7 +52,7 @@ public class AnnotationTest {
@Test
public void testReadingServiceBindingAnnotation() {
try {
- Class<?> classWithAnnotations = Loader.loadClass(HelloWorldMockup.class.getName());
+ Class<?> classWithAnnotations = ClassUtil.forName(HelloWorldMockup.class.getName(), this.getClass());
AnnotationProcessor ap = new AnnotationProcessor();
BindingTemplate bindingTemplate = ap.parseServiceBinding(classWithAnnotations, "en", null, null);
assertNotNull(bindingTemplate);
Modified: juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch (original)
+++ juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch Tue Dec 14 01:07:45 2010
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/juddi-console"/>
@@ -64,11 +64,9 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/jUDDI/juddi-console/uddi-portlets/target/uddi-portlets-3.0.0.SNAPSHOT/WEB-INF/lib/uddi-ws-3.0.0.SNAPSHOT.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/juddi-console/uddi-portlets/src/main/resources" path="3" type="2"/> "/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out target/www org.apache.juddi.portlets.UDDIBrowser/UDDIBrowser.html"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juddi-console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -Xmx256M"/>
</launchConfiguration>
Modified: juddi/trunk/juddi-core-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/pom.xml?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/pom.xml (original)
+++ juddi/trunk/juddi-core-openjpa/pom.xml Tue Dec 14 01:07:45 2010
@@ -130,19 +130,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.5</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <!-- not sure why maven does not figure this out by itself -->
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>org.apache.juddi</groupId>
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java Tue Dec 14 01:07:45 2010
@@ -20,6 +20,8 @@ import java.rmi.RemoteException;
import java.util.List;
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.juddi.api_v3.DeletePublisher;
import org.apache.juddi.api_v3.GetPublisherDetail;
@@ -32,7 +34,6 @@ import org.apache.juddi.jaxb.EntityCreat
import org.apache.juddi.v3.error.InvalidKeyPassedException;
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -48,7 +49,7 @@ import org.uddi.v3_service.UDDISecurityP
*/
public class API_010_PublisherTest {
- private static Logger logger = Logger.getLogger(API_010_PublisherTest.class);
+ private static Log logger = LogFactory.getLog(API_010_PublisherTest.class);
private JUDDIApiImpl publisher = new JUDDIApiImpl();
private UDDISecurityPortType security = new UDDISecurityImpl();
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java Tue Dec 14 01:07:45 2010
@@ -17,11 +17,12 @@ package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
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.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckTModel;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -36,7 +37,7 @@ import org.uddi.v3_service.UDDISecurityP
public class API_020_TmodelTest {
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
- private static Logger logger = Logger.getLogger(API_020_TmodelTest.class);
+ private static Log logger = LogFactory.getLog(API_020_TmodelTest.class);
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static String authInfoJoe = null;
private static String authInfoSam = null;
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java Tue Dec 14 01:07:45 2010
@@ -17,12 +17,13 @@ package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
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.juddi.v3.tck.TckBusiness;
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckTModel;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -35,7 +36,7 @@ import org.uddi.v3_service.UDDISecurityP
*/
public class API_030_BusinessEntityTest {
- private static Logger logger = Logger.getLogger(API_030_BusinessEntityTest.class);
+ private static Log logger = LogFactory.getLog(API_030_BusinessEntityTest.class);
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java Tue Dec 14 01:07:45 2010
@@ -17,13 +17,14 @@ package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
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.juddi.v3.tck.TckBusiness;
import org.apache.juddi.v3.tck.TckBusinessService;
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckTModel;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -36,8 +37,7 @@ import org.uddi.v3_service.UDDISecurityP
*/
public class API_040_BusinessServiceTest
{
-
- private static Logger logger = Logger.getLogger(API_040_BusinessServiceTest.class);
+ private static Log logger = LogFactory.getLog(API_040_BusinessServiceTest.class);
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java Tue Dec 14 01:07:45 2010
@@ -17,6 +17,8 @@ package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
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.juddi.v3.tck.TckBindingTemplate;
import org.apache.juddi.v3.tck.TckBusiness;
@@ -25,7 +27,6 @@ import org.apache.juddi.v3.tck.TckFindEn
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckTModel;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -37,8 +38,7 @@ import org.junit.Test;
*/
public class API_050_BindingTemplateTest
{
-
- private static Logger logger = Logger.getLogger(API_050_BindingTemplateTest.class);
+ private static Log logger = LogFactory.getLog(API_050_BindingTemplateTest.class);
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java Tue Dec 14 01:07:45 2010
@@ -21,6 +21,8 @@ package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
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.juddi.v3.tck.TckBusiness;
import org.apache.juddi.v3.tck.TckFindEntity;
@@ -28,7 +30,6 @@ import org.apache.juddi.v3.tck.TckPublis
import org.apache.juddi.v3.tck.TckPublisherAssertion;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckTModel;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -37,7 +38,7 @@ import org.uddi.v3_service.UDDISecurityP
public class API_060_PublisherAssertionTest {
- private static Logger logger = Logger.getLogger(API_060_PublisherAssertionTest.class);
+ private static Log logger = LogFactory.getLog(API_060_PublisherAssertionTest.class);
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java Tue Dec 14 01:07:45 2010
@@ -17,6 +17,8 @@ package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
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.juddi.v3.tck.TckBindingTemplate;
import org.apache.juddi.v3.tck.TckBusiness;
@@ -25,7 +27,6 @@ import org.apache.juddi.v3.tck.TckFindEn
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckTModel;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -37,8 +38,7 @@ import org.junit.Test;
*/
public class API_070_FindEntityTest
{
-
- private static Logger logger = Logger.getLogger(API_070_FindEntityTest.class);
+ private static Log logger = LogFactory.getLog(API_070_FindEntityTest.class);
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java Tue Dec 14 01:07:45 2010
@@ -17,6 +17,8 @@ package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
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.juddi.v3.tck.TckBindingTemplate;
import org.apache.juddi.v3.tck.TckBusiness;
@@ -25,7 +27,6 @@ import org.apache.juddi.v3.tck.TckPublis
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckSubscription;
import org.apache.juddi.v3.tck.TckTModel;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -37,7 +38,7 @@ import org.junit.Test;
*/
public class API_080_SubscriptionTest
{
- private static Logger logger = Logger.getLogger(API_080_SubscriptionTest.class);
+ private static Log logger = LogFactory.getLog(API_080_SubscriptionTest.class);
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java Tue Dec 14 01:07:45 2010
@@ -17,6 +17,8 @@ package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
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.juddi.api_v3.Clerk;
import org.apache.juddi.api_v3.ClerkDetail;
@@ -32,7 +34,6 @@ import org.apache.juddi.api_v3.SaveNode;
import org.apache.juddi.v3.error.InvalidKeyPassedException;
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -46,7 +47,7 @@ import org.uddi.v3_service.UDDISecurityP
public class API_100_ClientSubscriptionInfoTest {
private JUDDIApiImpl publisher = new JUDDIApiImpl();
- private static Logger logger = Logger.getLogger(API_100_ClientSubscriptionInfoTest.class);
+ private static Log logger = LogFactory.getLog(API_100_ClientSubscriptionInfoTest.class);
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static String authInfoJoe = null;
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java Tue Dec 14 01:07:45 2010
@@ -21,6 +21,8 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api.impl.API_010_PublisherTest;
import org.apache.juddi.cryptor.Cryptor;
import org.apache.juddi.cryptor.CryptorFactory;
@@ -33,7 +35,6 @@ import org.apache.juddi.v3.auth.XMLDocAu
import org.apache.juddi.v3.error.AuthenticationException;
import org.apache.juddi.v3.error.FatalErrorException;
import org.apache.juddi.v3.error.UnknownUserException;
-import org.apache.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
@@ -42,7 +43,7 @@ import org.junit.Test;
*/
public class AuthenticatorTest
{
- private Logger logger = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
/**
* The DefaultAuthenticator is basically a pass-through.
* @throws ConfigurationException
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/keygen/KeyGeneratorTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/keygen/KeyGeneratorTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/keygen/KeyGeneratorTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/keygen/KeyGeneratorTest.java Tue Dec 14 01:07:45 2010
@@ -15,8 +15,9 @@
package org.apache.juddi.keygen;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.config.Property;
-import org.apache.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
@@ -25,7 +26,7 @@ import org.junit.Test;
*/
public class KeyGeneratorTest
{
- private Logger logger = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
@Test()
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java Tue Dec 14 01:07:45 2010
@@ -22,6 +22,8 @@ import java.util.Date;
import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api.impl.API_010_PublisherTest;
import org.apache.juddi.api.impl.UDDIInquiryImpl;
import org.apache.juddi.api.impl.UDDIPublicationImpl;
@@ -29,7 +31,6 @@ import org.apache.juddi.api.impl.UDDISec
import org.apache.juddi.api.impl.UDDISubscriptionImpl;
import org.apache.juddi.model.Subscription;
import org.apache.juddi.model.UddiEntityPublisher;
-import org.apache.juddi.subscription.SubscriptionNotifier;
import org.apache.juddi.v3.tck.TckBindingTemplate;
import org.apache.juddi.v3.tck.TckBusiness;
import org.apache.juddi.v3.tck.TckBusinessService;
@@ -37,7 +38,6 @@ import org.apache.juddi.v3.tck.TckPublis
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckSubscription;
import org.apache.juddi.v3.tck.TckTModel;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -51,7 +51,7 @@ import org.uddi.v3_service.DispositionRe
*/
public class SubscriptionNotifierTest
{
- private static Logger logger = Logger.getLogger(SubscriptionNotifierTest.class);
+ private static Log logger = LogFactory.getLog(SubscriptionNotifierTest.class);
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
private static TckBusiness tckBusiness = new TckBusiness(new UDDIPublicationImpl(), new UDDIInquiryImpl());
Modified: juddi/trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/pom.xml?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/pom.xml (original)
+++ juddi/trunk/juddi-core/pom.xml Tue Dec 14 01:07:45 2010
@@ -146,29 +146,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <!-- not sure why maven does not figure this out by itself -->
- <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>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/ClassUtil.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/ClassUtil.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/ClassUtil.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/ClassUtil.java Tue Dec 14 01:07:45 2010
@@ -16,6 +16,8 @@
*/
package org.apache.juddi;
+import java.net.URL;
+
/**
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
@@ -49,4 +51,21 @@ public class ClassUtil {
return Class.forName(name, true, ClassLoader.getSystemClassLoader()) ;
}
+
+ public static URL getResource(String name, Class<?> caller)
+ {
+ ClassLoader threadClassLoader = Thread.currentThread().getContextClassLoader();
+ if (threadClassLoader != null) {
+
+ URL url = threadClassLoader.getResource(name);
+
+ if (url != null)
+ return url;
+
+ }
+
+ ClassLoader callerClassLoader = caller.getClassLoader();
+
+ return callerClassLoader.getResource(name);
+ }
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java Tue Dec 14 01:07:45 2010
@@ -3,16 +3,17 @@ package org.apache.juddi;
import javax.naming.NamingException;
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.rmi.JNDIRegistration;
import org.apache.juddi.subscription.SubscriptionNotifier;
-import org.apache.log4j.Logger;
public class Registry {
private static Registry registry = null;
- private static Logger log = Logger.getLogger(Registry.class);
+ private static Log log = LogFactory.getLog(Registry.class);
private static SubscriptionNotifier subscriptionNotifier = null;
/**
* Singleton.
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java Tue Dec 14 01:07:45 2010
@@ -30,6 +30,9 @@ import javax.persistence.Query;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.ClassUtil;
import org.apache.juddi.api_v3.Clerk;
import org.apache.juddi.api_v3.ClerkDetail;
import org.apache.juddi.api_v3.ClientSubscriptionInfoDetail;
@@ -63,8 +66,6 @@ import org.apache.juddi.validation.Valid
import org.apache.juddi.validation.ValidateNode;
import org.apache.juddi.validation.ValidatePublish;
import org.apache.juddi.validation.ValidatePublisher;
-import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.Loader;
import org.uddi.api_v3.DeleteTModel;
import org.uddi.sub_v3.GetSubscriptionResults;
import org.uddi.sub_v3.SubscriptionResultsList;
@@ -80,7 +81,7 @@ import org.uddi.v3_service.UDDISubscript
targetNamespace = "urn:juddi-apache-org:v3_service")
public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortType {
- private Logger log = Logger.getLogger(this.getClass());
+ private Log log = LogFactory.getLog(this.getClass());
/**
* Saves publisher(s) to the persistence layer. This method is specific to jUDDI.
@@ -546,7 +547,7 @@ public class JUDDIApiImpl extends Authen
Clerk fromClerk = clientSubscriptionInfoMap.get(subscriptionKey).getFromClerk();
Clerk toClerk = clientSubscriptionInfoMap.get(subscriptionKey).getToClerk();
String clazz = fromClerk.getNode().getProxyTransport();
- Class<?> transportClass = Loader.loadClass(clazz);
+ Class<?> transportClass = ClassUtil.forName(clazz, this.getClass());
Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(fromClerk.getNode().getName());
UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService(fromClerk.getNode().getSubscriptionUrl());
SubscriptionResultsList list = subscriptionService.getSubscriptionResults(getSubscriptionResult);
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java Tue Dec 14 01:07:45 2010
@@ -23,6 +23,8 @@ import javax.persistence.EntityTransacti
import javax.persistence.EntityManager;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.v3.error.ErrorMessage;
import org.apache.juddi.v3.error.InvalidKeyPassedException;
@@ -51,7 +53,6 @@ import org.uddi.api_v3.TModelDetail;
import org.uddi.api_v3.TModelList;
import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDIInquiryPortType;
-import org.apache.log4j.Logger;
/**
@@ -62,7 +63,7 @@ import org.apache.log4j.Logger;
targetNamespace = "urn:uddi-org:v3_service")
public class UDDIInquiryImpl extends AuthenticatedService implements UDDIInquiryPortType {
- private static Logger log = Logger.getLogger(UDDIInquiryImpl.class);
+ private static Log log = LogFactory.getLog(UDDIInquiryImpl.class);
public BindingDetail findBinding(FindBinding body)
throws DispositionReportFaultMessage {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java Tue Dec 14 01:07:45 2010
@@ -60,6 +60,8 @@ import org.uddi.sub_v3.SubscriptionResul
import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDISubscriptionPortType;
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;
@@ -74,15 +76,13 @@ import org.apache.juddi.v3.error.ErrorMe
import org.apache.juddi.v3.error.FatalErrorException;
import org.apache.juddi.v3.error.InvalidValueException;
import org.apache.juddi.validation.ValidateSubscription;
-import org.apache.log4j.Logger;
-
@WebService(serviceName="UDDISubscriptionService",
endpointInterface="org.uddi.v3_service.UDDISubscriptionPortType",
targetNamespace = "urn:uddi-org:v3_service")
public class UDDISubscriptionImpl extends AuthenticatedService implements UDDISubscriptionPortType {
- private static Logger logger = Logger.getLogger(UDDISubscriptionImpl.class);
+ private static Log logger = LogFactory.getLog(UDDISubscriptionImpl.class);
public static final int DEFAULT_SUBSCRIPTIONEXPIRATION_DAYS = 30;
public static final int DEFAULT_CHUNKEXPIRATION_MINUTES = 5;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java Tue Dec 14 01:07:45 2010
@@ -26,6 +26,8 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.config.PersistenceManager;
import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.subscription.NotificationList;
@@ -33,7 +35,6 @@ import org.apache.juddi.v3.error.ErrorMe
import org.apache.juddi.v3.error.FatalErrorException;
import org.apache.juddi.v3.error.InvalidKeyPassedException;
import org.apache.juddi.validation.ValidateSubscriptionListener;
-import org.apache.log4j.Logger;
import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.Result;
import org.uddi.subr_v3.NotifySubscriptionListener;
@@ -46,7 +47,7 @@ import org.uddi.v3_service.UDDISubscript
public class UDDISubscriptionListenerImpl extends AuthenticatedService implements
UDDISubscriptionListenerPortType {
- private static Logger logger = Logger.getLogger(UDDISubscriptionListenerImpl.class);
+ private static Log logger = LogFactory.getLog(UDDISubscriptionListenerImpl.class);
@SuppressWarnings("unchecked")
public DispositionReport notifySubscriptionListener(
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java Tue Dec 14 01:07:45 2010
@@ -16,10 +16,11 @@
*/
package org.apache.juddi.api.impl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api_v3.Clerk;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.XRegistration;
-import org.apache.log4j.Logger;
import org.uddi.api_v3.BindingDetail;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessDetail;
@@ -37,7 +38,7 @@ import org.uddi.sub_v3.SubscriptionResul
*/
public class XRegisterHelper {
- private static Logger log = Logger.getLogger(XRegisterHelper.class);
+ private static Log log = LogFactory.getLog(XRegisterHelper.class);
public static void handle(Clerk fromClerk, Clerk toClerk, SubscriptionResultsList list) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Tue Dec 14 01:07:45 2010
@@ -30,13 +30,14 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.SystemConfiguration;
import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.ClassUtil;
import org.apache.juddi.Registry;
import org.apache.juddi.keygen.KeyGenerator;
import org.apache.juddi.model.UddiEntityPublisher;
import org.apache.juddi.query.FindBusinessByCategoryQuery;
import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.Loader;
import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.KeyedReference;
@@ -49,7 +50,7 @@ import org.uddi.api_v3.KeyedReference;
public class AppConfig
{
private final static String JUDDI_PROPERTIES = "juddiv3.properties";
- private Logger log = Logger.getLogger(AppConfig.class);
+ private Log log = LogFactory.getLog(AppConfig.class);
private Configuration config;
private static AppConfig instance=null;
@@ -81,7 +82,7 @@ public class AppConfig
} else {
propConfig = new PropertiesConfiguration(JUDDI_PROPERTIES);
}
- URL url = Loader.getResource(JUDDI_PROPERTIES);
+ URL url = ClassUtil.getResource(JUDDI_PROPERTIES, this.getClass());
log.info("Reading from properties file: " + url);
long refreshDelay = propConfig.getLong(Property.JUDDI_CONFIGURATION_RELOAD_DELAY, 1000l);
log.debug("Setting refreshDelay to " + refreshDelay);
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java Tue Dec 14 01:07:45 2010
@@ -43,6 +43,9 @@ import javax.xml.transform.stream.Stream
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.ClassUtil;
import org.apache.juddi.api.impl.UDDIInquiryImpl;
import org.apache.juddi.keygen.KeyGenerator;
import org.apache.juddi.mapping.MappingApiToModel;
@@ -54,8 +57,6 @@ import org.apache.juddi.v3.error.KeyUnav
import org.apache.juddi.v3.error.ValueNotAllowedException;
import org.apache.juddi.validation.ValidatePublish;
import org.apache.juddi.validation.ValidateUDDIKey;
-import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.Loader;
import org.uddi.api_v3.SaveTModel;
import org.uddi.api_v3.TModel;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -73,7 +74,7 @@ public class Install {
public static final String FILE_PERSISTENCE = "persistence.xml";
public static final String JUDDI_INSTALL_DATA_DIR = "juddi_install_data/";
public static final String JUDDI_CUSTOM_INSTALL_DATA_DIR = "juddi_custom_install_data/";
- public static Logger log = Logger.getLogger(Install.class);
+ public static Log log = LogFactory.getLog(Install.class);
protected static void install(Configuration config) throws JAXBException, DispositionReportFaultMessage, IOException, ConfigurationException {
@@ -494,9 +495,9 @@ public class Install {
private static List<String> getPublishers(Configuration config) throws ConfigurationException {
List<String> publishers = new ArrayList<String>();
String basePath = JUDDI_CUSTOM_INSTALL_DATA_DIR;
- URL url = Loader.getResource(JUDDI_CUSTOM_INSTALL_DATA_DIR);
+ URL url = ClassUtil.getResource(JUDDI_CUSTOM_INSTALL_DATA_DIR, Install.class);
if (url==null) {
- url = Loader.getResource(JUDDI_INSTALL_DATA_DIR);
+ url = ClassUtil.getResource(JUDDI_INSTALL_DATA_DIR, Install.class);
basePath = JUDDI_INSTALL_DATA_DIR;
}
@@ -567,12 +568,12 @@ public class Install {
InputStream resourceStream = null;
// First try the custom install directory
- URL url = Loader.getResource(JUDDI_CUSTOM_INSTALL_DATA_DIR + fileName);
+ URL url = ClassUtil.getResource(JUDDI_CUSTOM_INSTALL_DATA_DIR + fileName, Install.class);
if (url != null) resourceStream = url.openStream();
// If the custom install directory doesn't exist, then use the standard install directory where the resource is guaranteed to exist.
if (resourceStream == null) {
- url = Loader.getResource(JUDDI_INSTALL_DATA_DIR + fileName);
+ url = ClassUtil.getResource(JUDDI_INSTALL_DATA_DIR + fileName, Install.class);
if (url != null) {
resourceStream = url.openStream();
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PersistenceManager.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PersistenceManager.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PersistenceManager.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PersistenceManager.java Tue Dec 14 01:07:45 2010
@@ -22,10 +22,11 @@ import javax.persistence.Persistence;
import javax.persistence.EntityManager;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class PersistenceManager {
- private static Logger log = Logger.getLogger(PersistenceManager.class);
+ private static Log log = LogFactory.getLog(PersistenceManager.class);
public static final String PERSISTENCE_UNIT_NAME = "juddiDatabase";
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PublisherFileFilter.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PublisherFileFilter.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PublisherFileFilter.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/PublisherFileFilter.java Tue Dec 14 01:07:45 2010
@@ -3,7 +3,9 @@ package org.apache.juddi.config;
import java.io.File;
import java.io.FileFilter;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* From the
*
@@ -12,7 +14,7 @@ import org.apache.log4j.Logger;
*/
public class PublisherFileFilter implements FileFilter {
- private Logger log = Logger.getLogger(this.getClass());
+ private Log log = LogFactory.getLog(this.getClass());
public boolean accept(File file) {
log.debug("file=" + file);
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java Tue Dec 14 01:07:45 2010
@@ -18,9 +18,11 @@
package org.apache.juddi.cryptor;
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;
/**
* Used to create the org.apache.juddi.cryptor.Cryptor implementation
@@ -32,9 +34,7 @@ import org.apache.log4j.Logger;
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
public abstract class CryptorFactory {
- private static Logger log = Logger.getLogger(CryptorFactory.class);
-
-
+ private static Log log = LogFactory.getLog(CryptorFactory.class);
// the shared Cryptor instance
private static Cryptor cryptor = null;
@@ -75,7 +75,7 @@ public abstract class CryptorFactory {
Class<?> cryptorClass = null;
try {
// Use Loader to locate & load the Cryptor implementation
- cryptorClass = org.apache.log4j.helpers.Loader.loadClass(className);
+ cryptorClass = ClassUtil.forName(className, CryptorFactory.class);
}
catch(ClassNotFoundException e) {
log.error("The specified Cryptor class '" + className + "' was not found in classpath.");
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java Tue Dec 14 01:07:45 2010
@@ -18,9 +18,11 @@
package org.apache.juddi.keygen;
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;
/**
* Used to create the org.apache.juddi.keygen.KeyGenerator implementation
@@ -31,7 +33,7 @@ import org.apache.log4j.Logger;
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
public abstract class KeyGeneratorFactory {
- private static Logger log = Logger.getLogger(KeyGeneratorFactory.class);
+ private static Log log = LogFactory.getLog(KeyGeneratorFactory.class);
// Key Generator default implementation
private static final String DEFAULT_IMPL = "org.apache.juddi.keygen.DefaultKeyGenerator";
@@ -75,7 +77,7 @@ public abstract class KeyGeneratorFactor
Class<?> keygenClass = null;
try {
// Use Loader to locate & load the Key Generator implementation
- keygenClass = org.apache.log4j.helpers.Loader.loadClass(className);
+ keygenClass = ClassUtil.forName(className,KeyGeneratorFactory.class);
// try to instantiate the Key Generator implementation
keyGenerator = (KeyGenerator)keygenClass.newInstance();
} catch(ClassNotFoundException cnfe) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=1048885&r1=1048884&r2=1048885&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Tue Dec 14 01:07:45 2010
@@ -23,10 +23,11 @@ import java.util.List;
import javax.xml.bind.JAXBException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.jaxb.JAXBMarshaller;
import org.apache.juddi.v3.error.ErrorMessage;
import org.apache.juddi.v3.error.FatalErrorException;
-import org.apache.log4j.Logger;
import org.uddi.api_v3.Description;
import org.uddi.sub_v3.ObjectFactory;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -38,7 +39,7 @@ import org.uddi.v3_service.DispositionRe
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
public class MappingApiToModel {
- private static Logger logger = Logger.getLogger(MappingApiToModel.class);
+ private static Log logger = LogFactory.getLog(MappingApiToModel.class);
public static void mapPublisher(org.apache.juddi.api_v3.Publisher apiPublisher,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org