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/09/04 22:16:26 UTC
svn commit: r811536 - in /webservices/juddi/trunk: docs/
juddi-core/src/main/java/org/apache/juddi/config/
juddi-core/src/main/java/org/apache/juddi/mapping/
juddi-core/src/main/java/org/apache/juddi/validation/
uddi-client/src/test/java/org/apache/jud...
Author: kstam
Date: Fri Sep 4 20:16:25 2009
New Revision: 811536
URL: http://svn.apache.org/viewvc?rev=811536&view=rev
Log:
cleaning up warnings
Modified:
webservices/juddi/trunk/docs/jUDDI-UserGuide.pdf
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java
webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java
Modified: webservices/juddi/trunk/docs/jUDDI-UserGuide.pdf
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/docs/jUDDI-UserGuide.pdf?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
Binary files - no diff available.
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Fri Sep 4 20:16:25 2009
@@ -39,7 +39,6 @@
import org.apache.log4j.Logger;
import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.KeyedReference;
-import org.uddi.api_v3.ObjectFactory;
import org.uddi.v3_service.DispositionReportFaultMessage;
/**
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Fri Sep 4 20:16:25 2009
@@ -21,13 +21,13 @@
import java.util.GregorianCalendar;
import java.util.List;
-import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import org.apache.juddi.error.ErrorMessage;
import org.apache.juddi.error.FatalErrorException;
import org.apache.juddi.util.JAXBMarshaller;
import org.apache.log4j.Logger;
+import org.uddi.api_v3.Description;
import org.uddi.sub_v3.ObjectFactory;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -358,11 +358,9 @@
throws DispositionReportFaultMessage {
if (apiCategoryBag != null) {
- List krList = apiCategoryBag.getKeyedReference();
- List<org.uddi.api_v3.KeyedReferenceGroup> krgList = apiCategoryBag.getKeyedReferenceGroup();
+ List<org.uddi.api_v3.KeyedReference> krList = apiCategoryBag.getKeyedReference();
for (Object elem : krList) {
if (elem instanceof org.uddi.api_v3.KeyedReference) {
- org.uddi.api_v3.KeyedReference kr = (org.uddi.api_v3.KeyedReference) elem;
List<org.apache.juddi.model.KeyedReference> modelKeyedReferences=modelCategoryBag.getKeyedReferences();
//modelKeyedReferences.clear();
org.uddi.api_v3.KeyedReference apiKeyedReference = (org.uddi.api_v3.KeyedReference)elem;
@@ -370,6 +368,7 @@
apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
}
}
+ List<org.uddi.api_v3.KeyedReferenceGroup> krgList = apiCategoryBag.getKeyedReferenceGroup();
for (org.uddi.api_v3.KeyedReferenceGroup elem : krgList) {
if (elem instanceof org.uddi.api_v3.KeyedReferenceGroup) {
org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup = (org.uddi.api_v3.KeyedReferenceGroup) elem;
@@ -464,7 +463,7 @@
throws DispositionReportFaultMessage {
if (apiOverviewDoc != null) {
- List descContent = apiOverviewDoc.getDescription();
+ List<Description> descContent = apiOverviewDoc.getDescription();
for (Object elem : descContent) {
org.uddi.api_v3.Description description = (org.uddi.api_v3.Description) elem;
if (description != null) {
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Fri Sep 4 20:16:25 2009
@@ -20,7 +20,6 @@
import java.util.Collections;
import java.util.List;
-import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import org.apache.juddi.error.ErrorMessage;
@@ -31,7 +30,6 @@
import org.apache.juddi.util.JAXBMarshaller;
import org.apache.log4j.Logger;
import org.uddi.api_v3.CompletionStatus;
-import org.uddi.api_v3.ObjectFactory;
import org.uddi.api_v3.OperationalInfo;
import org.uddi.sub_v3.SubscriptionFilter;
import org.uddi.v3_service.DispositionReportFaultMessage;
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java Fri Sep 4 20:16:25 2009
@@ -21,8 +21,6 @@
import java.util.List;
import java.util.Hashtable;
-import javax.xml.bind.JAXBElement;
-
import org.uddi.api_v3.GetBusinessDetail;
import org.uddi.api_v3.GetOperationalInfo;
import org.uddi.api_v3.GetServiceDetail;
@@ -36,7 +34,6 @@
import org.uddi.api_v3.KeyedReference;
import org.uddi.api_v3.KeyedReferenceGroup;
import org.uddi.api_v3.Name;
-import org.uddi.api_v3.ObjectFactory;
import org.uddi.api_v3.TModelBag;
import org.uddi.v3_service.DispositionReportFaultMessage;
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java Fri Sep 4 20:16:25 2009
@@ -17,46 +17,43 @@
package org.apache.juddi.validation;
-import java.util.List;
import java.util.HashSet;
+import java.util.List;
+
import javax.persistence.EntityManager;
-import javax.xml.bind.JAXBElement;
import javax.xml.ws.Holder;
-import org.uddi.api_v3.KeyedReference;
-import org.uddi.api_v3.KeyedReferenceGroup;
-import org.uddi.api_v3.Name;
-import org.uddi.api_v3.ObjectFactory;
-import org.uddi.api_v3.DeleteBusiness;
+import org.apache.juddi.api_v3.DeletePublisher;
+import org.apache.juddi.api_v3.SavePublisher;
+import org.apache.juddi.config.Constants;
+import org.apache.juddi.error.AssertionNotFoundException;
+import org.apache.juddi.error.ErrorMessage;
+import org.apache.juddi.error.FatalErrorException;
+import org.apache.juddi.error.InvalidKeyPassedException;
+import org.apache.juddi.error.InvalidProjectionException;
+import org.apache.juddi.error.KeyUnavailableException;
+import org.apache.juddi.error.UserMismatchException;
+import org.apache.juddi.error.ValueNotAllowedException;
+import org.apache.juddi.keygen.KeyGenerator;
+import org.apache.juddi.keygen.KeyGeneratorFactory;
+import org.apache.juddi.model.Publisher;
+import org.apache.juddi.model.UddiEntity;
+import org.apache.juddi.model.UddiEntityPublisher;
+import org.uddi.api_v3.AddPublisherAssertions;
import org.uddi.api_v3.DeleteBinding;
+import org.uddi.api_v3.DeleteBusiness;
import org.uddi.api_v3.DeletePublisherAssertions;
import org.uddi.api_v3.DeleteService;
import org.uddi.api_v3.DeleteTModel;
+import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.KeyedReferenceGroup;
+import org.uddi.api_v3.Name;
import org.uddi.api_v3.OverviewDoc;
-import org.uddi.api_v3.OverviewURL;
+import org.uddi.api_v3.SaveBinding;
import org.uddi.api_v3.SaveBusiness;
import org.uddi.api_v3.SaveService;
-import org.uddi.api_v3.SaveBinding;
import org.uddi.api_v3.SaveTModel;
-import org.uddi.api_v3.AddPublisherAssertions;
import org.uddi.v3_service.DispositionReportFaultMessage;
-import org.apache.juddi.api_v3.DeletePublisher;
-import org.apache.juddi.api_v3.SavePublisher;
-import org.apache.juddi.config.Constants;
-
-import org.apache.juddi.keygen.KeyGeneratorFactory;
-import org.apache.juddi.keygen.KeyGenerator;
-import org.apache.juddi.model.UddiEntityPublisher;
-import org.apache.juddi.model.Publisher;
-import org.apache.juddi.model.UddiEntity;
-import org.apache.juddi.error.ErrorMessage;
-import org.apache.juddi.error.FatalErrorException;
-import org.apache.juddi.error.InvalidKeyPassedException;
-import org.apache.juddi.error.AssertionNotFoundException;
-import org.apache.juddi.error.KeyUnavailableException;
-import org.apache.juddi.error.ValueNotAllowedException;
-import org.apache.juddi.error.InvalidProjectionException;
-import org.apache.juddi.error.UserMismatchException;
/**
@@ -828,7 +825,7 @@
return;
// If category bag does exist, it must have at least one element
- List elems = categories.getKeyedReference();
+ List<KeyedReference> elems = categories.getKeyedReference();
List<KeyedReferenceGroup> groups = categories.getKeyedReferenceGroup();
if (groups.size() == 0 && elems.size() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.categorybag.NoInput"));
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java Fri Sep 4 20:16:25 2009
@@ -20,13 +20,11 @@
import java.util.List;
import java.util.StringTokenizer;
-import javax.xml.bind.JAXBElement;
-
-import org.uddi.v3_service.DispositionReportFaultMessage;
-import org.apache.juddi.keygen.KeyGenerator;
import org.apache.juddi.error.ErrorMessage;
import org.apache.juddi.error.InvalidKeyPassedException;
import org.apache.juddi.error.ValueNotAllowedException;
+import org.apache.juddi.keygen.KeyGenerator;
+import org.uddi.v3_service.DispositionReportFaultMessage;
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java Fri Sep 4 20:16:25 2009
@@ -19,7 +19,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
-import org.apache.juddi.config.AppConfig;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.Loader;
import org.junit.AfterClass;
@@ -27,7 +26,6 @@
import org.junit.BeforeClass;
import org.junit.Test;
import org.uddi.api_v3.client.config.ClientConfig;
-import org.uddi.api_v3.client.config.Property;
import org.uddi.api_v3.client.transport.InVMTransport;
import org.uddi.api_v3.client.transport.Transport;
import org.uddi.api_v3.tck.TckBusiness;
Modified: webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java Fri Sep 4 20:16:25 2009
@@ -26,8 +26,6 @@
import java.util.Iterator;
import java.util.List;
-import javax.xml.bind.JAXBElement;
-
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
import org.uddi.api_v3.CategoryBag;
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java Fri Sep 4 20:16:25 2009
@@ -21,12 +21,11 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java Fri Sep 4 20:16:25 2009
@@ -21,17 +21,12 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.JAXBElement;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlTransient;
-
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
/**
* <p>Java class for instanceDetails complex type.
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java Fri Sep 4 20:16:25 2009
@@ -19,15 +19,11 @@
package org.uddi.api_v3;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java?rev=811536&r1=811535&r2=811536&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java Fri Sep 4 20:16:25 2009
@@ -21,13 +21,11 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org