svn commit: r326650 - in /webservices/wsrf/trunk/src/java/org/apache/ws: resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java util/jndi/tools/MetadataConfigImpl.java

[sc...@apache.org]

Author: scamp
Date: Wed Oct 19 12:04:27 2005
New Revision: 326650

URL: http://svn.apache.org/viewcvs?rev=326650&view=rev
Log: (empty)

Modified:
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java?rev=326650&r1=326649&r2=326650&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java Wed Oct 19 12:04:27 2005
@@ -105,26 +105,27 @@
 				// create a new metadata section
 				MetadataSectionDocument.MetadataSection metadataSection = responseMetadata
 						.addNewMetadataSection();
-				Object data = metadataList.get(i);
+				MetadataEntry metadataEntry = (MetadataEntry) metadataList.get(i);
+				XmlObject metadata = metadataEntry.getMetadata();
 				metadataSection.setDialect(dialectKey);
 				if ((identifier != null) && !"".equals(identifier)) {
 					metadataSection.setIdentifier(identifier);
 				}
 
 				/** Determine type of metadata to add * */
-				if (data instanceof MetadataReferenceDocument) {
+				if (metadata instanceof MetadataReferenceDocument) {
 					// adds a MetadataReference for locating the metadata
 					metadataSection
-							.setMetadataReference((EndpointReferenceType) data);
-				} else if (data instanceof LocationDocument) {
+							.setMetadataReference((EndpointReferenceType) metadata);
+				} else if (metadata instanceof LocationDocument) {
 					// adds a Location for locating the metadata
-					metadataSection.setLocation(((LocationDocument) data)
+					metadataSection.setLocation(((LocationDocument) metadata)
 							.getLocation());
 				} else {
 					// else its the metadata document and must be added as a
 					// child for the "any"
 					XmlBeanUtils.addChildElement(metadataSection,
-							(XmlObject) data);
+							(XmlObject) metadata);
 				}
 			}
 		}

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java?rev=326650&r1=326649&r2=326650&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java Wed Oct 19 12:04:27 2005
@@ -28,7 +28,7 @@
  * A config object to represent the MetadataExchange information from the
  * jndi-config.xml config file. <p/> This class will store any "loadable"
  * metadata documents, this will avoid unnecessary loading of files.
- * 
+ *
  * @author Sal Campana
  */
 public class MetadataConfigImpl {
@@ -36,19 +36,19 @@
 
 	/**
 	 * Internal Map for storing metatdata.
-	 * 
+	 *
 	 * The map will have the structure of:
-	 * 
+	 *
 	 * key=dialect value=Map (dialect-specific Map)
-	 * 
+	 *
 	 * The dialect-specific Map will have the structure:
-	 * 
+	 *
 	 * Two Entries: key= IDENTIFIER_MAP value= A Map keyed on Identifier
 	 * keyed-to the metatdata
-	 * 
+	 *
 	 * key= COMPLETE_METADATA_LIST value= A List containing ALL metadata given
 	 * this dialect (this includes all entries from IDENTIFIER_MAP)
-	 * 
+	 *
 	 */
 	private Map m_dialectToMetadataListMap = new HashMap();
 
@@ -56,7 +56,7 @@
 
 	/**
 	 * Creates a new {@link MetadataConfigImpl} object.
-	 * 
+	 *
 	 * @param metadata
 	 *            DOCUMENT_ME
 	 */
@@ -72,7 +72,7 @@
 
 	/**
 	 * Returns all known metadata for all dialects.
-	 * 
+	 *
 	 * @return A list of all metadata
 	 */
 	public List getAllMetadata() {
@@ -81,7 +81,7 @@
 
 	/**
 	 * Returns the metadata given a dialect and an identifier.
-	 * 
+	 *
 	 * @param dialect
 	 * @param identifierUri
 	 * @return A Map keyed on dialect keyed-to a List of metadata
@@ -109,7 +109,7 @@
 		// if dialect was not defined then they are saying "send all!"
 		else {
 			return buildDialectToListMap();
-		}
+		}                
 		return results;
 	}
 
@@ -128,7 +128,7 @@
 
 	/**
 	 * Returns metadata based on dialect
-	 * 
+	 *
 	 * @param dialect
 	 * @return A Map keyed on dialect keyed-to a List of metadata
 	 */
@@ -138,9 +138,9 @@
 
 	/**
 	 * Adds the parsed-in metadata to the undelying lookup structures.
-	 * 
+	 *
 	 * precondition: The structures have already been setup for the metadata
-	 * 
+	 *
 	 * @param dialect
 	 * @param identifier
 	 * @param metadata
@@ -169,7 +169,7 @@
 
 	/**
 	 * Loads up lookup structures with the metadata.
-	 * 
+	 *
 	 * This method initializes a Map for a given dialect if it doesn't already
 	 * exist. The Map is keyed using 2 constants for pulling a map of
 	 * identifiers->metatada AND a List of all metatdata.