Author: kstam
Date: Tue Dec 14 01:30:25 2010
New Revision: 1048892
URL: http://svn.apache.org/viewvc?rev=1048892&view=rev
Log:
JUDDI-436, switching from log4j to commons.logging.
Modified:
juddi/trunk/juddi-console/uddi-portlets/pom.xml
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
Modified: juddi/trunk/juddi-console/uddi-portlets/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/pom.xml?rev=1048892&r1=1048891&r2=1048892&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/pom.xml (original)
+++ juddi/trunk/juddi-console/uddi-portlets/pom.xml Tue Dec 14 01:30:25 2010
@@ -96,49 +96,11 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.5</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
@@ -166,7 +128,7 @@
<webXml>target/web.xml</webXml>
</configuration>
</plugin>
- <!-- configure the GWT-Maven plugin -->
+ <!-- configure the GWT-Maven plugin
<plugin>
<groupId>com.totsp.gwt</groupId>
<artifactId>maven-googlewebtoolkit2-plugin</artifactId>
@@ -190,13 +152,13 @@
<execution>
<goals>
<goal>mergewebxml</goal>
- <!--
<goal>i18n</goal>-->
<goal>compile</goal>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
+ -->
<!-- Use the dependency plugin to unpack
gwt-dev-PLATFORM-libs.zip -->
<!--
(this is a replacement for the old "automatic"
mode - useful if you
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java?rev=1048892&r1=1048891&r2=1048892&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/FindServiceImpl.java
Tue Dec 14 01:30:25 2010
@@ -22,6 +22,8 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.portlets.client.model.Business;
import org.apache.juddi.portlets.client.model.Service;
import org.apache.juddi.portlets.client.service.FindResponse;
@@ -29,7 +31,6 @@ import org.apache.juddi.portlets.client.
import org.apache.juddi.v3.client.config.WebHelper;
import org.apache.juddi.v3.client.i18n.EntityForLang;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.log4j.Logger;
import org.uddi.api_v3.BusinessInfo;
import org.uddi.api_v3.BusinessList;
import org.uddi.api_v3.FindBusiness;
@@ -47,7 +48,7 @@ import com.google.gwt.user.server.rpc.Re
public class FindServiceImpl extends RemoteServiceServlet implements
FindService {
private static final long serialVersionUID = 1939609260067702168L;
- private Logger logger = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
public FindResponse getBusinesses(String nameStr, String[]
findQualifyers)
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java?rev=1048892&r1=1048891&r2=1048892&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/InquiryServiceImpl.java
Tue Dec 14 01:30:25 2010
@@ -22,6 +22,8 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.portlets.client.model.Business;
import org.apache.juddi.portlets.client.model.Service;
import org.apache.juddi.portlets.client.model.ServiceBinding;
@@ -31,7 +33,6 @@ import org.apache.juddi.portlets.client.
import org.apache.juddi.v3.client.config.WebHelper;
import org.apache.juddi.v3.client.i18n.EntityForLang;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.log4j.Logger;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessDetail;
import org.uddi.api_v3.BusinessEntity;
@@ -53,7 +54,7 @@ import com.google.gwt.user.server.rpc.Re
public class InquiryServiceImpl extends RemoteServiceServlet implements
InquiryService {
private static final long serialVersionUID = 8509627428299232161L;
- private Logger logger = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
public InquiryServiceImpl() {
super();
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java?rev=1048892&r1=1048891&r2=1048892&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java
Tue Dec 14 01:30:25 2010
@@ -24,6 +24,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import org.apache.commons.beanutils.BeanUtils;
+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.GetAllPublisherDetail;
import org.apache.juddi.api_v3.GetPublisherDetail;
@@ -36,7 +38,6 @@ import org.apache.juddi.v3.client.config
import org.apache.juddi.v3.client.config.WebHelper;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
-import org.apache.log4j.Logger;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
/**
@@ -47,7 +48,7 @@ import com.google.gwt.user.server.rpc.Re
public class JUDDIApiServiceImpl extends RemoteServiceServlet implements
JUDDIApiService {
private static final long serialVersionUID = -4079331701560975888L;
- private Logger logger = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
public JUDDIApiServiceImpl() {
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java?rev=1048892&r1=1048891&r2=1048892&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java
Tue Dec 14 01:30:25 2010
@@ -22,9 +22,10 @@ import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.portlets.client.service.NotifyResponse;
import org.apache.juddi.portlets.client.service.NotifyService;
-import org.apache.log4j.Logger;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
@@ -36,7 +37,7 @@ import com.google.gwt.user.server.rpc.Re
public class NotifyServiceImpl extends RemoteServiceServlet implements
NotifyService {
private static final long serialVersionUID = 6312615857204115941L;
- private Logger logger = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
public NotifyServiceImpl() {
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java?rev=1048892&r1=1048891&r2=1048892&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/PublicationServiceImpl.java
Tue Dec 14 01:30:25 2010
@@ -22,6 +22,8 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.portlets.client.model.Business;
import org.apache.juddi.portlets.client.model.Service;
import org.apache.juddi.portlets.client.service.PublicationResponse;
@@ -29,7 +31,6 @@ import org.apache.juddi.portlets.client.
import org.apache.juddi.v3.client.config.WebHelper;
import org.apache.juddi.v3.client.i18n.EntityForLang;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.log4j.Logger;
import org.uddi.api_v3.BusinessInfo;
import org.uddi.api_v3.GetRegisteredInfo;
import org.uddi.api_v3.InfoSelection;
@@ -46,7 +47,7 @@ import com.google.gwt.user.server.rpc.Re
public class PublicationServiceImpl extends RemoteServiceServlet implements
PublicationService {
private static final long serialVersionUID = 8903795371009202903L;
- private Logger logger = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
public PublicationResponse getBusinesses(String authToken, String
infoSelection)
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java?rev=1048892&r1=1048891&r2=1048892&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
Tue Dec 14 01:30:25 2010
@@ -26,6 +26,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.portlets.client.service.SecurityResponse;
import org.apache.juddi.portlets.client.service.SecurityService;
import org.apache.juddi.v3.client.config.UDDIClerk;
@@ -33,7 +35,6 @@ import org.apache.juddi.v3.client.config
import org.apache.juddi.v3.client.config.WebHelper;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.transport.TransportException;
-import org.apache.log4j.Logger;
import org.uddi.api_v3.AuthToken;
import org.uddi.api_v3.DiscardAuthToken;
import org.uddi.api_v3.GetAuthToken;
@@ -51,21 +52,21 @@ public class SecurityServiceImpl extends
SecurityService {
private static final long serialVersionUID = -154327520485409858L;
- private Logger log = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
public SecurityResponse get(String username, String password) {
HttpServletRequest request = getThreadLocalRequest();
HttpSession session = request.getSession();
- log.debug("User " + username + " sending token request..");
+ logger.debug("User " + username + " sending token request..");
SecurityResponse response = new SecurityResponse();
String token = (String) session.getAttribute("AuthToken");
if (username==null) {
username = (String) session.getAttribute("UserName");
}
Principal user = request.getUserPrincipal();
- log.debug("UserPrincipal " + user);
+ logger.debug("UserPrincipal " + user);
if (username==null && user!=null) {
username = user.getName();
password = "";
@@ -85,12 +86,12 @@ public class SecurityServiceImpl extends
setClerkAuthenticationTokensInSession(username);
} catch (Exception e) {
- log.error("Could not obtain token. " +
e.getMessage(), e);
+ logger.error("Could not obtain token. "
+ e.getMessage(), e);
response.setSuccess(false);
response.setMessage(e.getMessage());
response.setErrorCode("101");
} catch (Throwable t) {
- log.error("Could not obtain token. " +
t.getMessage(), t);
+ logger.error("Could not obtain token. "
+ t.getMessage(), t);
response.setSuccess(false);
response.setMessage(t.getMessage());
response.setErrorCode("101");
@@ -102,12 +103,12 @@ public class SecurityServiceImpl extends
response.setSuccess(true);
response.setResponse(token);
} catch (Exception e) {
- log.error("Could not obtain token. " +
e.getMessage(), e);
+ logger.error("Could not obtain token. " +
e.getMessage(), e);
response.setSuccess(false);
response.setMessage(e.getMessage());
response.setErrorCode("101");
} catch (Throwable t) {
- log.error("Could not obtain token. " +
t.getMessage(), t);
+ logger.error("Could not obtain token. " +
t.getMessage(), t);
response.setSuccess(false);
response.setMessage(t.getMessage());
response.setErrorCode("101");
@@ -127,7 +128,7 @@ public class SecurityServiceImpl extends
getAuthToken.setUserID(username);
getAuthToken.setCred(password);
AuthToken authToken =
securityService.getAuthToken(getAuthToken);
- log.info("User " + username + " obtained token from node=" +
WebHelper.getUDDIHomeNode(servletContext).getName());
+ logger.info("User " + username + " obtained token from node=" +
WebHelper.getUDDIHomeNode(servletContext).getName());
return authToken;
}
@@ -148,7 +149,7 @@ public class SecurityServiceImpl extends
session.setAttribute("token-" +
clerk.getName(), clerkToken.getAuthInfo());
}
} catch (Exception e) {
- log.warn("Could not obtain authToken
for clerk=" + clerk.getName());
+ logger.warn("Could not obtain authToken
for clerk=" + clerk.getName());
}
}
}
@@ -164,9 +165,9 @@ public class SecurityServiceImpl extends
DiscardAuthToken discardAuthToken = new
DiscardAuthToken();
discardAuthToken.setAuthInfo(token);
securityService.discardAuthToken(discardAuthToken);
- log.info("User " + username + " invalided token");
+ logger.info("User " + username + " invalided token");
} catch (Exception e) {
- log.error(e.getMessage(),e);
+ logger.error(e.getMessage(),e);
}
}
}
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java?rev=1048892&r1=1048891&r2=1048892&view=diff
==============================================================================
---
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
(original)
+++
juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
Tue Dec 14 01:30:25 2010
@@ -28,6 +28,8 @@ import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.ws.Holder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.ClassUtil;
import org.apache.juddi.api_v3.ClientSubscriptionInfo;
import org.apache.juddi.api_v3.DeleteClientSubscriptionInfo;
@@ -48,7 +50,6 @@ import org.apache.juddi.v3.client.config
import org.apache.juddi.v3.client.config.WebHelper;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
-import org.apache.log4j.Logger;
import org.uddi.sub_v3.CoveragePeriod;
import org.uddi.sub_v3.DeleteSubscription;
import org.uddi.sub_v3.GetSubscriptionResults;
@@ -66,7 +67,7 @@ import com.google.gwt.user.server.rpc.Re
public class SubscriptionServiceImpl extends RemoteServiceServlet implements
SubscriptionService {
private static final long serialVersionUID = 6366224282740095468L;
- private Logger logger = Logger.getLogger(this.getClass());
+ private Log logger = LogFactory.getLog(this.getClass());
private final static String UP = "Up";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
