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 2009/05/29 20:52:30 UTC
svn commit: r780065 - in /webservices/juddi/branches/v3_trunk:
juddi-core/src/main/java/org/apache/juddi/api/impl/
juddi-core/src/main/java/org/apache/juddi/subscription/
juddi-core/src/main/java/org/apache/juddi/util/
juddi-core/src/main/java/org/apac...
Author: kstam
Date: Fri May 29 18:52:28 2009
New Revision: 780065
URL: http://svn.apache.org/viewvc?rev=780065&view=rev
Log:
Cleaning up unused imports and code.
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/NotificationList.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscriptionListener.java
webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/EntityCreator.java
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java?rev=780065&r1=780064&r2=780065&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java Fri May 29 18:52:28 2009
@@ -18,21 +18,16 @@
package org.apache.juddi.api.impl;
import java.io.StringWriter;
-import java.util.ArrayList;
import javax.jws.WebService;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
-import org.apache.juddi.config.PersistenceManager;
import org.apache.juddi.error.ErrorMessage;
import org.apache.juddi.error.FatalErrorException;
-import org.apache.juddi.model.UddiEntityPublisher;
-import org.apache.juddi.validation.ValidateSubscriptionListener;
import org.apache.juddi.util.NotificationList;
+import org.apache.juddi.validation.ValidateSubscriptionListener;
import org.apache.log4j.Logger;
import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.Result;
@@ -48,6 +43,7 @@
private static Logger logger = Logger.getLogger(UDDISubscriptionListenerImpl.class);
+ @SuppressWarnings("unchecked")
public DispositionReport notifySubscriptionListener(
NotifySubscriptionListener body)
throws DispositionReportFaultMessage {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java?rev=780065&r1=780064&r2=780065&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java Fri May 29 18:52:28 2009
@@ -16,7 +16,6 @@
*/
package org.apache.juddi.subscription;
-import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
@@ -29,8 +28,6 @@
import javax.persistence.EntityTransaction;
import javax.persistence.LockModeType;
import javax.persistence.Query;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.Duration;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/NotificationList.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/NotificationList.java?rev=780065&r1=780064&r2=780065&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/NotificationList.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/NotificationList.java Fri May 29 18:52:28 2009
@@ -4,11 +4,12 @@
public class NotificationList {
private static NotificationList nl = null;
- private static Vector list = null;
+ private static Vector<?> list = null;
private NotificationList() {
}
+ @SuppressWarnings("unchecked")
public static NotificationList getInstance() {
if (nl == null) {
nl = new NotificationList();
@@ -17,6 +18,7 @@
return nl;
}
+ @SuppressWarnings("unchecked")
public Vector getNotifications() {
return list;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscriptionListener.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscriptionListener.java?rev=780065&r1=780064&r2=780065&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscriptionListener.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscriptionListener.java Fri May 29 18:52:28 2009
@@ -19,7 +19,6 @@
import org.apache.juddi.error.ErrorMessage;
import org.apache.juddi.error.FatalErrorException;
-import org.apache.juddi.model.UddiEntityPublisher;
import org.uddi.subr_v3.NotifySubscriptionListener;
/**
Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=780065&r1=780064&r2=780065&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java Fri May 29 18:52:28 2009
@@ -25,24 +25,16 @@
import org.uddi.api_v3.client.config.ClientConfig;
import org.uddi.api_v3.client.config.Property;
import org.uddi.api_v3.client.transport.Transport;
-import org.uddi.api_v3.tck.EntityCreator;
-import org.uddi.api_v3.tck.TckBindingTemplate;
import org.uddi.api_v3.tck.TckBusiness;
import org.uddi.api_v3.tck.TckBusinessService;
import org.uddi.api_v3.tck.TckPublisher;
import org.uddi.api_v3.tck.TckSecurity;
-import org.uddi.api_v3.tck.TckSubscription;
import org.uddi.api_v3.tck.TckSubscriptionListener;
import org.uddi.api_v3.tck.TckTModel;
-import org.uddi.sub_v3.Subscription;
-import org.uddi.subr_v3.NotifySubscriptionListener;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
import org.uddi.v3_service.UDDISubscriptionPortType;
-import org.uddi.v3_service.UDDISubscriptionListenerPortType;
-
-import org.uddi.api_v3.BusinessService;
/**
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
@@ -54,8 +46,6 @@
private static TckTModel tckTModel = null;
private static TckBusiness tckBusiness = null;
private static TckBusinessService tckBusinessService = null;
- private static TckBindingTemplate tckBindingTemplate = null;
- private static TckSubscription tckSubscription = null;
private static TckSubscriptionListener tckSubscriptionListener = null;
private static UDDIPublicationPortType publication = null;
@@ -82,14 +72,11 @@
publication = transport.getPublishService();
UDDIInquiryPortType inquiry = transport.getInquiryService();
UDDISubscriptionPortType subscription = transport.getSubscriptionService();
- UDDISubscriptionListenerPortType listener = transport.getSubscriptionListenerService();
tckTModel = new TckTModel(publication, inquiry);
tckBusiness = new TckBusiness(publication, inquiry);
tckBusinessService = new TckBusinessService(publication, inquiry);
- tckBindingTemplate = new TckBindingTemplate(publication, inquiry);
- tckSubscription = new TckSubscription(subscription, security);
- tckSubscriptionListener = new TckSubscriptionListener(listener, subscription, inquiry, publication);
+ tckSubscriptionListener = new TckSubscriptionListener(subscription, publication);
} else {
Assert.fail();
}
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/EntityCreator.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/EntityCreator.java?rev=780065&r1=780064&r2=780065&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/EntityCreator.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/EntityCreator.java Fri May 29 18:52:28 2009
@@ -18,7 +18,6 @@
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
*/
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java?rev=780065&r1=780064&r2=780065&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java Fri May 29 18:52:28 2009
@@ -16,42 +16,22 @@
*/
import static junit.framework.Assert.assertEquals;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import javax.xml.ws.Holder;
import org.apache.log4j.Logger;
import org.junit.Assert;
-
-import org.uddi.api_v3.BindingDetail;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.DeleteBinding;
-import org.uddi.api_v3.GetBindingDetail;
import org.uddi.api_v3.SaveBinding;
-
-
-import org.uddi.api_v3.BusinessService;
-import org.uddi.api_v3.DeleteService;
-import org.uddi.api_v3.GetServiceDetail;
import org.uddi.api_v3.SaveService;
-import org.uddi.api_v3.ServiceDetail;
import org.uddi.sub_v3.DeleteSubscription;
-import org.uddi.sub_v3.GetSubscriptionResults;
import org.uddi.sub_v3.Subscription;
-import org.uddi.sub_v3.SubscriptionResultsList;
-import org.uddi.subr_v3.NotifySubscriptionListener;
-import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISubscriptionListenerPortType;
import org.uddi.v3_service.UDDISubscriptionPortType;
-import org.uddi.api_v3.TModel;
-import org.uddi.api_v3.TModelList;
-import org.uddi.api_v3.Name;
-import org.uddi.api_v3.SaveTModel;
-import org.uddi.api_v3.FindTModel;
-
/**
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
@@ -78,19 +58,14 @@
private Logger logger = Logger.getLogger(this.getClass());
private UDDIPublicationPortType publication = null;
- private UDDIInquiryPortType inquiry = null;
- private UDDISubscriptionListenerPortType listener = null;
private UDDISubscriptionPortType subscription = null;
private SaveService ss = null;
- public TckSubscriptionListener(UDDISubscriptionListenerPortType listener,
+ public TckSubscriptionListener(
UDDISubscriptionPortType subscription,
- UDDIInquiryPortType inquiry,
UDDIPublicationPortType publication) {
super();
- this.listener = listener;
this.subscription = subscription;
- this.inquiry = inquiry;
this.publication = publication;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org