Property changes on: C:\cygwin\home\kstam\dev\juddi
___________________________________________________________________
Name: svn:ignore
   + build
bin
.classpath
.project


Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/datastore/jdbc/Database.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/datastore/jdbc/Database.java	(revision 0)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/datastore/jdbc/Database.java	(revision 0)
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.datastore.jdbc;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.registry.RegistryEngine;
+import org.apache.juddi.util.Config;
+
+
+/**
+ * @author Steve Viens (sviens@apache.org)
+ */
+public class Database
+{
+  // private reference to the jUDDI logger
+  private static Log log = LogFactory.getLog(Database.class);
+  
+  // grab the JDBC properties we'll need to setup 
+  // the connection pool.
+  private static String jdbcDriver = Config.getStringProperty(
+		  RegistryEngine.PROPNAME_JDBC_DRIVER,RegistryEngine.DEFAULT_JDBC_DRIVER);
+  private static String jdbcURL = Config.getStringProperty(
+		  RegistryEngine.PROPNAME_JDBC_URL,RegistryEngine.DEFAULT_JDBC_URL);
+  private static String jdbcUser = Config.getStringProperty(
+		  RegistryEngine.PROPNAME_JDBC_USERNAME,RegistryEngine.DEFAULT_JDBC_USERNAME);
+  private static String jdbcPassword = Config.getStringProperty(
+		  RegistryEngine.PROPNAME_JDBC_PASSWORD,RegistryEngine.DEFAULT_JDBC_PASSWORD);
+
+  /**
+   *
+   */
+  public static Connection aquireConnection()
+    throws SQLException
+  {
+   
+
+    // make sure the JDBC Driver is loaded
+    
+    try {
+    	Class.forName(jdbcDriver);
+    }
+    catch(ClassNotFoundException cnfex) {
+      throw new SQLException("Could not locate JDBC Driver '" +
+      		jdbcDriver+"' in classpath: "+cnfex.getMessage());
+    }
+
+    // okay, get and return the connection
+    
+    Connection connection = 
+    	DriverManager.getConnection(jdbcURL,jdbcUser,jdbcPassword);
+    	
+    return connection;
+  }
+}
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/InquiryService.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/InquiryService.java	(revision 0)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/InquiryService.java	(revision 0)
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.registry.local;
+
+import java.util.TreeSet;
+
+import org.apache.juddi.IRegistry;
+import org.apache.juddi.error.FatalErrorException;
+import org.apache.juddi.error.RegistryException;
+import org.apache.juddi.error.UnsupportedException;
+import org.w3c.dom.Element;
+
+/**
+ * @author Kurt Stam (kurt.stam@jboss.com)
+ */
+public class InquiryService extends AbstractService
+{
+//	 collection of valid operations
+	  private TreeSet operations = null;
+	  
+  public InquiryService() {
+		super();
+		operations = new TreeSet();
+	  	operations.add("find_business");
+	  	operations.add("find_service");
+	  	operations.add("find_binding");
+	  	operations.add("find_tmodel");
+	  	operations.add("find_relatedbusinesses");
+	  	operations.add("get_businessdetail");
+	  	operations.add("get_businessdetailext");
+	  	operations.add("get_servicedetail");
+	  	operations.add("get_bindingdetail");
+	  	operations.add("get_tmodeldetail");
+	}
+
+  public void validateRequest(String operation,String version,Element uddiReq)
+		throws RegistryException
+	{
+    // If the value 
+  	// specified is not "2.0" then throw an exception (this 
+  	// value must be specified for all UDDI requests and 
+  	// only version 2.0 UDDI requests are supported by 
+  	// this endpoint).
+
+  	if (version == null)
+      throw new FatalErrorException("A UDDI generic attribute " +
+        "value was not found for UDDI request: "+operation+" (The " +
+        "'generic' attribute must be present)");
+    else if (!version.equals(IRegistry.UDDI_V2_GENERIC))
+      throw new UnsupportedException("Only UDDI v2 " +
+        "requests are currently supported. The generic attribute value " +
+        "received was: "+version);
+
+    if ((operation == null) || (operation.trim().length() == 0))
+      throw new FatalErrorException("The UDDI service operation " +
+        "could not be identified.");
+    else if (!operations.contains(operation.toLowerCase()))
+    	throw new UnsupportedException("The operation "+operation+" is not " +
+    			"supported by the UDDI version 2 Inquiry API.");
+	}
+}
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/AbstractService.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/AbstractService.java	(revision 0)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/AbstractService.java	(revision 0)
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.registry.local;
+
+import java.util.Vector;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.soap.SOAPException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.datatype.RegistryObject;
+import org.apache.juddi.datatype.response.DispositionReport;
+import org.apache.juddi.datatype.response.ErrInfo;
+import org.apache.juddi.datatype.response.Result;
+import org.apache.juddi.error.BusyException;
+import org.apache.juddi.error.FatalErrorException;
+import org.apache.juddi.error.RegistryException;
+import org.apache.juddi.error.UnsupportedException;
+import org.apache.juddi.handler.HandlerMaker;
+import org.apache.juddi.handler.IHandler;
+import org.apache.juddi.registry.RegistryEngine;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * @author Kurt Stam (kurt.stam@jboss.com)
+ */
+public abstract class AbstractService
+{
+  // private reference to the webapp's logger.
+  private static Log log = LogFactory.getLog(AbstractService.class);
+  
+  // XML Document Builder
+  private static DocumentBuilder docBuilder = null;
+
+  public Node handleRequest(Element uddiReq) throws Exception
+  {
+    try 
+    {
+      if (uddiReq == null)
+        throw new FatalErrorException("A UDDI request was not " +
+          "found in the SOAP message.");
+      
+      // Grab the local name of the UDDI request element
+      // from the UDDI Request. If a value isn't returned 
+      // (either null or an empty String is returned) then 
+      // throw a FatalError exception. This is probably a 
+      // configuration problem related to the XML Parser 
+      // that jUDDI is using.
+      
+      String operation = uddiReq.getLocalName();
+      if ((operation == null) || (operation.trim().length() == 0))
+        throw new FatalErrorException("The UDDI service operation " +
+          "could not be identified.");
+      
+      // Grab the generic attribute value (version value).  If 
+      // one isn't specified or the value specified is not "2.0" 
+      // then throw an exception (this value must be specified 
+      // for all UDDI requests and currently only vesion 2.0
+      // UDDI requests are supported).
+
+      String version = uddiReq.getAttribute("generic");
+      if (version == null)
+        throw new FatalErrorException("A UDDI generic attribute " +
+          "value was not found for UDDI request: "+operation+" (The " +
+          "'generic' attribute must be present)");
+
+      // Verify that the appropriate endpoint was targeted for
+      // this service request.  The validateRequest method will
+      // throw an UnsupportedException if anything's amiss.
+
+      validateRequest(operation,version,uddiReq);
+      
+      // Lookup the appropriate XML handler.  Throw an 
+      // UnsupportedException if one could not be located.
+
+      HandlerMaker maker = HandlerMaker.getInstance();
+			IHandler requestHandler = maker.lookup(operation);
+      if (requestHandler == null)
+        throw new UnsupportedException("The UDDI service operation " +
+          "specified is unknown or unsupported: " +operation);
+      
+      // Unmarshal the raw xml into the appropriate jUDDI
+      // request object.
+
+      RegistryObject uddiReqObj = requestHandler.unmarshal(uddiReq);
+      
+      // Grab a reference to the shared jUDDI registry 
+      // instance (make sure it's running) and execute the 
+      // requested UDDI function.
+      
+      RegistryObject uddiResObj = null;      
+      RegistryEngine registry = Registry.getRegistry();
+      if ((registry != null) && (registry.isAvailable()))
+        uddiResObj = registry.execute(uddiReqObj);
+      else
+        throw new BusyException("The Registry is currently unavailable.");
+      
+      // Lookup the appropriate response handler which will
+      // be used to marshal the UDDI object into the appropriate 
+      // xml format.
+      
+      IHandler responseHandler = maker.lookup(uddiResObj.getClass().getName());
+      if (responseHandler == null)
+        throw new FatalErrorException("The response object " +
+          "type is unknown: " +uddiResObj.getClass().getName());
+      
+      // Create a new 'temp' XML element to use as a container 
+      // in which to marshal the UDDI response data into.
+        
+      DocumentBuilder docBuilder = getDocumentBuilder();
+      Document document = docBuilder.newDocument();
+      Element element = document.createElement("temp");
+      
+      // Lookup the appropriate response handler and marshal 
+      // the juddi object into the appropriate xml format (we 
+      // only support UDDI v2.0 at this time).  Attach the
+      // results to the body of the SOAP response.
+        
+      responseHandler.marshal(uddiResObj,element);
+      
+      // Grab a reference to the 'temp' element's
+      // only child here (this has the effect of
+      // discarding the temp element) and append 
+      // this child to the soap response body
+      document.appendChild(element.getFirstChild());
+
+      return document;
+    } 
+    catch(Exception ex) // Catch ALL exceptions
+    {
+      // SOAP Fault values
+      String faultCode = null;
+      String faultString = null;
+      String faultActor = null;
+      
+      // UDDI DispositionReport values
+      String errno = null;
+      String errCode = null;
+      String errText = null;
+      
+      // All RegistryException and subclasses of RegistryException
+      // should contain values for populating a SOAP Fault as well
+      // as a UDDI DispositionReport with specific information 
+      // about the problem.
+      //
+      // We've got to dig out the dispositionReport and populate  
+      // the SOAP Fault 'detail' element with this information.        
+      
+      if (ex instanceof RegistryException)
+      {
+        // Since we've intercepted a RegistryException type
+        // then we can assume this is a "controlled" event
+        // and simply log the error message without a stack
+        // trace.
+
+        log.error(ex.getMessage());
+
+        RegistryException rex = (RegistryException)ex;
+        
+        faultCode = rex.getFaultCode();  // SOAP Fault faultCode
+        faultString = rex.getFaultString();  // SOAP Fault faultString
+        faultActor = rex.getFaultActor();  // SOAP Fault faultActor
+        
+        DispositionReport dispRpt = rex.getDispositionReport();
+        if (dispRpt != null)
+        {
+          Result result = null;
+          ErrInfo errInfo = null;
+        
+          Vector results = dispRpt.getResultVector();
+          if ((results != null) && (!results.isEmpty()))
+            result = (Result)results.elementAt(0);
+        
+          if (result != null)
+          {
+            errno = String.valueOf(result.getErrno());  // UDDI Result errno
+            errInfo = result.getErrInfo();
+          
+            if (errInfo != null)
+            {
+              errCode = errInfo.getErrCode();  // UDDI ErrInfo errCode
+              errText = errInfo.getErrMsg();  // UDDI ErrInfo errMsg
+            }
+          }
+        }
+      }
+      else if (ex instanceof SOAPException)
+      {
+        log.error(ex.getMessage());
+          
+        // Because something occured that jUDDI wasn't expecting
+        // let's set default SOAP Fault values.  Since SOAPExceptions
+        // here are most likely XML validation errors let's blame the
+        // client by placing "Client" in the Fault Code and pass
+        // the Exception message back to the client.
+        
+        faultCode = "Client";
+        faultString = ex.getMessage();
+        faultActor = null;
+        
+        // Let's set default values for the UDDI DispositionReport
+        // here.  While we didn't catch a RegistryException (or 
+        // subclass) we're going to be friendly and include a
+        // FatalError DispositionReport within the message from the 
+        // SAX parsing problem in the SOAP Fault anyway.
+        
+        errno = String.valueOf(Result.E_FATAL_ERROR);
+        errCode = Result.lookupErrCode(Result.E_FATAL_ERROR); 
+        errText = Result.lookupErrText(Result.E_FATAL_ERROR) + 
+                  " " + ex.getMessage();
+      }
+      else // anything else
+      {
+        // All other exceptions (other than SOAPException or 
+        // RegistryException and subclasses) are either a result 
+        // of a jUDDI configuration problem or something that 
+        // we *should* be catching and converting to a 
+        // RegistryException but are not (yet!).
+            
+        log.error(ex.getMessage(),ex);
+
+        // Because something occured that jUDDI wasn't expecting
+        // let's set default SOAP Fault values.  Since jUDDI
+        // should be catching anything significant let's blame 
+        // jUDDI by placing "Server" in the Fault Code and pass
+        // the Exception message on to the client.
+        
+        faultCode = "Server";
+        faultString = ex.getMessage();
+        faultActor = null;
+          
+        // Let's set default values for the UDDI DispositionReport
+        // here.  While we didn't catch a RegistryException (or 
+        // subclass) but we're going to be friendly and include a
+        // FatalError DispositionReport within the SOAP Fault anyway.
+        
+        errno = String.valueOf(Result.E_FATAL_ERROR);
+        errCode = Result.lookupErrCode(Result.E_FATAL_ERROR); 
+        errText = Result.lookupErrText(Result.E_FATAL_ERROR) +
+                  " An internal UDDI server error has " +
+                  "occurred. Please report this error " +
+                  "to the UDDI server administrator.";
+      }
+      
+      // We should have everything we need to assemble 
+      // the SOAPFault so lets piece it together and 
+      // send it on it's way.
+      String fault = "faultCode=" + faultCode + ", faultString=" + faultString 
+  	+ ", faultActor=" + faultActor + ", errno=" + errno + ", errCode=" + errCode
+  	+ ", errText=" + errText;
+      //FIX ME Kurt, change to other type of exception.
+      throw new Exception(fault);
+    }
+  }
+
+  /**
+   * 
+   */
+  public abstract void validateRequest(String operation,String generic,Element uddiReq)
+  	throws RegistryException;
+  
+  /**
+   *
+   */
+  private DocumentBuilder getDocumentBuilder()
+  {
+    if (docBuilder == null)
+      docBuilder = createDocumentBuilder();    
+    return docBuilder;
+  }
+
+  /**
+   *
+   */
+  private synchronized DocumentBuilder createDocumentBuilder()
+  {
+    if (docBuilder != null)
+      return docBuilder;
+
+    try {
+     DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+     factory.setNamespaceAware(true);
+     //factory.setValidating(true);
+
+     docBuilder = factory.newDocumentBuilder();
+    }
+    catch(ParserConfigurationException pcex) {
+      pcex.printStackTrace();
+    }
+
+    return docBuilder;
+  }
+}
\ No newline at end of file
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/PublishService.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/PublishService.java	(revision 0)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/PublishService.java	(revision 0)
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.registry.local;
+
+import java.util.TreeSet;
+
+import org.apache.juddi.IRegistry;
+import org.apache.juddi.error.FatalErrorException;
+import org.apache.juddi.error.RegistryException;
+import org.apache.juddi.error.UnsupportedException;
+import org.w3c.dom.Element;
+
+/**
+ * @author Kurt Stam (kurt.stam@jboss.com)
+ */
+public class PublishService extends AbstractService
+{
+  // collection of valid operations
+  private TreeSet operations = null;
+
+  public PublishService() {
+	super();
+	operations = new TreeSet();
+  	operations.add("get_authtoken");
+  	operations.add("get_registeredinfo");
+  	operations.add("discard_authtoken");
+  	operations.add("save_business");
+  	operations.add("save_service");
+  	operations.add("save_binding");
+  	operations.add("save_tmodel");
+  	operations.add("delete_business");
+  	operations.add("delete_service");
+  	operations.add("delete_binding");
+  	operations.add("delete_tmodel");
+  	operations.add("add_publisherassertions");
+  	operations.add("set_publisherassertions");
+  	operations.add("get_publisherassertions");
+  	operations.add("delete_publisherassertions");
+  	operations.add("get_assertionstatusreport");
+}
+
+
+  public void validateRequest(String operation,String version,Element uddiReq)
+		throws RegistryException
+	{
+    // If the value 
+  	// specified is not "2.0" then throw an exception (this 
+  	// value must be specified for all UDDI requests and 
+  	// only version 2.0 UDDI requests are supported by 
+  	// this endpoint).
+
+  	if (version == null)
+      throw new FatalErrorException("A UDDI generic attribute " +
+        "value was not found for UDDI request: "+operation+" (The " +
+        "'generic' attribute must be present)");
+    else if (!version.equals(IRegistry.UDDI_V2_GENERIC))
+      throw new UnsupportedException("Only UDDI v2 " +
+        "requests are currently supported. The generic attribute value " +
+        "received was: "+version);
+
+    if ((operation == null) || (operation.trim().length() == 0))
+      throw new FatalErrorException("The UDDI service operation " +
+        "could not be identified.");
+    else if (!operations.contains(operation.toLowerCase()))
+    	throw new UnsupportedException("The operation "+operation+" is not " +
+    			"supported by the UDDI version 2 Publish API.");
+	}
+}
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/Registry.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/Registry.java	(revision 0)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/local/Registry.java	(revision 0)
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.registry.local;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.registry.RegistryEngine;
+
+/**
+ * This servlet is ONLY used to initialize the jUDDI webapp on
+ * startup and cleanup the jUDDI webapp on shutdown.
+ * 
+ * @author Kurt Stam (kurt.stam@jboss.com)
+ */
+public abstract class Registry
+{ 
+  // default config file name. 
+  private static final String DEFAULT_PROPERTY_FILE = "/juddi.properties";
+   
+  // private reference to the webapp's logger.
+  private static Log log = LogFactory.getLog(Registry.class);
+
+  // registry singleton instance
+  private static RegistryEngine registry = null;
+
+/**
+   * Create the shared instance of jUDDI's Registry class
+   * and call it's "init()" method to initialize all core 
+   * components.
+   */
+  public static void init() 
+  {   
+
+    Properties props = new Properties();
+
+    try
+    {      
+      log.info("Loading jUDDI configuration.");
+        
+      // determine the name of the juddi property file to use from web.xml
+      String propFile = DEFAULT_PROPERTY_FILE;
+      
+      InputStream is = Class.class.getResourceAsStream(propFile);
+        
+      if (is != null)
+      {
+        log.info("Resources loaded from: "+propFile);
+
+        // Load jUDDI configuration from the 
+        // juddi.properties file found in root directory.
+
+        props.load(is);
+      }
+      else
+      {
+        log.warn("Could not locate jUDDI properties '" + propFile + 
+                "'. Using defaults.");
+
+        // A juddi.properties file doesn't exist
+        // yet so create create a new Properties 
+        // instance using default property values.
+        
+        props.put(RegistryEngine.PROPNAME_OPERATOR_NAME,
+                  RegistryEngine.DEFAULT_OPERATOR_NAME);
+        
+        props.put(RegistryEngine.PROPNAME_I18N_LANGUAGE_CODE,
+            			RegistryEngine.DEFAULT_I18N_LANGUAGE_CODE);
+  
+        props.put(RegistryEngine.PROPNAME_I18N_COUNTRY_CODE,
+            			RegistryEngine.DEFAULT_I18N_COUNTRY_CODE);
+  
+        props.put(RegistryEngine.PROPNAME_DISCOVERY_URL,
+                  RegistryEngine.DEFAULT_DISCOVERY_URL);
+        
+        props.put(RegistryEngine.PROPNAME_ADMIN_EMAIL_ADDRESS,
+                  RegistryEngine.DEFAULT_ADMIN_EMAIL_ADDRESS);
+        
+        props.put(RegistryEngine.PROPNAME_DATASOURCE_NAME,
+                  RegistryEngine.DEFAULT_DATASOURCE_NAME);
+        
+        props.put(RegistryEngine.PROPNAME_IS_USE_DATASOURCE,
+                  RegistryEngine.DEFAULT_IS_USE_DATASOURCE);
+        
+        props.put(RegistryEngine.PROPNAME_JDBC_DRIVER,
+                RegistryEngine.DEFAULT_JDBC_DRIVER);
+      
+        props.put(RegistryEngine.PROPNAME_JDBC_URL,
+                RegistryEngine.DEFAULT_JDBC_URL);
+      
+        props.put(RegistryEngine.PROPNAME_JDBC_USERNAME,
+                RegistryEngine.DEFAULT_JDBC_USERNAME);
+      
+        props.put(RegistryEngine.PROPNAME_JDBC_PASSWORD,
+                RegistryEngine.DEFAULT_JDBC_PASSWORD);
+              
+        props.put(RegistryEngine.PROPNAME_AUTH_CLASS_NAME,
+                  RegistryEngine.DEFAULT_AUTH_CLASS_NAME);
+        
+        props.put(RegistryEngine.PROPNAME_CRYPTOR_CLASS_NAME,
+                  RegistryEngine.DEFAULT_CRYPTOR_CLASS_NAME);
+        
+        props.put(RegistryEngine.PROPNAME_DATASTORE_CLASS_NAME,
+                  RegistryEngine.DEFAULT_DATASTORE_CLASS_NAME);
+        
+        props.put(RegistryEngine.PROPNAME_UUIDGEN_CLASS_NAME,
+                  RegistryEngine.DEFAULT_UUIDGEN_CLASS_NAME);
+        
+        props.put(RegistryEngine.PROPNAME_VALIDATOR_CLASS_NAME,
+                  RegistryEngine.DEFAULT_VALIDATOR_CLASS_NAME);  
+
+        props.put(RegistryEngine.PROPNAME_MAX_NAME_ELEMENTS,
+                  Integer.toString(RegistryEngine.DEFAULT_MAX_NAME_ELEMENTS));
+        
+        props.put(RegistryEngine.PROPNAME_MAX_NAME_LENGTH,
+                  Integer.toString(RegistryEngine.DEFAULT_MAX_NAME_LENGTH));
+
+        props.put(RegistryEngine.PROPNAME_MAX_MESSAGE_SIZE,
+                  Integer.toString(RegistryEngine.DEFAULT_MAX_MESSAGE_SIZE));        
+
+        props.put(RegistryEngine.PROPNAME_MAX_BUSINESSES_PER_PUBLISHER,
+                  Integer.toString(RegistryEngine.DEFAULT_MAX_BUSINESSES_PER_PUBLISHER));
+        
+        props.put(RegistryEngine.PROPNAME_MAX_SERVICES_PER_BUSINESS,
+                  Integer.toString(RegistryEngine.DEFAULT_MAX_SERVICES_PER_BUSINESS));
+        
+        props.put(RegistryEngine.PROPNAME_MAX_BINDINGS_PER_SERVICE,
+                  Integer.toString(RegistryEngine.DEFAULT_MAX_BINDINGS_PER_SERVICE));
+        
+        props.put(RegistryEngine.PROPNAME_MAX_TMODELS_PER_PUBLISHER,
+                  Integer.toString(RegistryEngine.DEFAULT_MAX_TMODELS_PER_PUBLISHER));
+        
+        props.put(RegistryEngine.PROPNAME_MAX_ROWS_LIMIT,           
+                  Integer.toString(RegistryEngine.DEFAULT_MAX_ROWS_LIMIT));
+      }
+    }
+    catch(IOException ioex) {
+      log.error(ioex.getMessage(),ioex);
+    }
+
+    log.info("Initializing jUDDI components.");
+    
+    registry = new RegistryEngine(props);
+    registry.init();
+  }
+  
+  /**
+   * Grab the shared instance of jUDDI's Registry class and
+   * call it's "dispose()" method to notify all sub-components
+   * to stop any background threads and release any external
+   * resources they may have aquired.
+   */
+  public void destroy()
+  {
+    log.info("jUDDI Stopping: Cleaning up existing resources.");
+
+    RegistryEngine registry = Registry.getRegistry();
+    if (registry != null)
+      registry.dispose();
+  }
+
+  /**
+   *
+   */
+  public static RegistryEngine getRegistry()
+  {
+	  init();
+      return registry;
+  }
+}
\ No newline at end of file
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/RegistryServlet.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/RegistryServlet.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/RegistryServlet.java	(working copy)
@@ -106,6 +106,21 @@
         
         props.put(RegistryEngine.PROPNAME_DATASOURCE_NAME,
                   RegistryEngine.DEFAULT_DATASOURCE_NAME);
+        
+        props.put(RegistryEngine.PROPNAME_IS_USE_DATASOURCE,
+                  RegistryEngine.DEFAULT_IS_USE_DATASOURCE);
+        
+        props.put(RegistryEngine.PROPNAME_JDBC_DRIVER,
+                RegistryEngine.DEFAULT_JDBC_DRIVER);
+      
+        props.put(RegistryEngine.PROPNAME_JDBC_URL,
+                RegistryEngine.DEFAULT_JDBC_URL);
+      
+        props.put(RegistryEngine.PROPNAME_JDBC_USERNAME,
+                RegistryEngine.DEFAULT_JDBC_USERNAME);
+      
+        props.put(RegistryEngine.PROPNAME_JDBC_PASSWORD,
+                RegistryEngine.DEFAULT_JDBC_PASSWORD);
               
         props.put(RegistryEngine.PROPNAME_AUTH_CLASS_NAME,
                   RegistryEngine.DEFAULT_AUTH_CLASS_NAME);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/RegistryEngine.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/RegistryEngine.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/registry/RegistryEngine.java	(working copy)
@@ -50,6 +50,11 @@
   public static final String PROPNAME_DISCOVERY_URL = "juddi.discoveryURL";
   public static final String PROPNAME_ADMIN_EMAIL_ADDRESS = "juddi.adminEmailAddress"; // unused
   public static final String PROPNAME_DATASOURCE_NAME = "juddi.dataSource";
+  public static final String PROPNAME_IS_USE_DATASOURCE = "juddi.isUseDataSource";
+  public static final String PROPNAME_JDBC_DRIVER = "juddi.jdbcDriver";
+  public static final String PROPNAME_JDBC_URL = "juddi.jdbcUrl";
+  public static final String PROPNAME_JDBC_USERNAME = "juddi.jdbcUsername";
+  public static final String PROPNAME_JDBC_PASSWORD = "juddi.jdbcPassword";
   
   public static final String PROPNAME_AUTH_CLASS_NAME = "juddi.auth";
   public static final String PROPNAME_DATASTORE_CLASS_NAME = "juddi.dataStore";
@@ -78,9 +83,14 @@
   public static final String DEFAULT_DISCOVERY_URL = "http://localhost:8080/juddi/uddiget.jsp?";
   public static final String DEFAULT_ADMIN_EMAIL_ADDRESS = "nobody@apache.org"; // unused
   public static final String DEFAULT_DATASOURCE_NAME = "java:comp/env/jdbc/juddiDB";
+  public static final Boolean DEFAULT_IS_USE_DATASOURCE = false;
+  public static final String DEFAULT_JDBC_DRIVER = "com.mysql.jdbc.Driver";
+  public static final String DEFAULT_JDBC_URL = "jdbc:mysql://localhost/juddi";
+  public static final String DEFAULT_JDBC_USERNAME = "juddi";
+  public static final String DEFAULT_JDBC_PASSWORD = "juddi";
   
   public static final String DEFAULT_AUTH_CLASS_NAME = "org.apache.juddi.auth.DefaultAuthenticator";
-  public static final String DEFAULT_DATASTORE_CLASS_NAME = "org.apache.juddi.datastore.JDBCDataStore";
+  public static final String DEFAULT_DATASTORE_CLASS_NAME = "org.apache.juddi.datastore.jdbc.JDBCDataStore";
   public static final String DEFAULT_CRYPTOR_CLASS_NAME = "org.apache.juddi.cryptor.DefaultCryptor";
   public static final String DEFAULT_UUIDGEN_CLASS_NAME = "org.apache.juddi.uuidgen.DefaultUUIDGen";
   public static final String DEFAULT_VALIDATOR_CLASS_NAME = "org.apache.juddi.validator.DefaultValidator";
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindServiceHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindServiceHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindServiceHandler.java	(working copy)
@@ -108,16 +108,17 @@
   public void marshal(RegistryObject object,Element parent)
   {
     FindService request = (FindService)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String key = request.getBusinessKey();
     if (key != null)
       element.setAttribute("businessKey",key);
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     int maxRows = request.getMaxRows();
     if (maxRows > 0)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveSubscriptionHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveSubscriptionHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveSubscriptionHandler.java	(working copy)
@@ -73,12 +73,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     SaveSubscription request = (SaveSubscription)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingTemplateHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingTemplateHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingTemplateHandler.java	(working copy)
@@ -102,7 +102,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BindingTemplate binding = (BindingTemplate)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String bindingKey = binding.getBindingKey();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessInfoHandler.java	(working copy)
@@ -86,7 +86,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessInfo info = (BusinessInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String businessKey = info.getBusinessKey();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RegisteredInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RegisteredInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RegisteredInfoHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.Description;
 import org.apache.juddi.datatype.Name;
 import org.apache.juddi.datatype.RegistryObject;
@@ -89,27 +88,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     RegisteredInfo info = (RegisteredInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = info.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = info.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = info.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessEntityExtHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessEntityExtHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessEntityExtHandler.java	(working copy)
@@ -87,7 +87,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessEntityExt businessExt = (BusinessEntityExt)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     BusinessEntity business = businessExt.getBusinessEntity();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetRegisteredInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetRegisteredInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetRegisteredInfoHandler.java	(working copy)
@@ -65,12 +65,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetRegisteredInfo request = (GetRegisteredInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveBusinessHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveBusinessHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveBusinessHandler.java	(working copy)
@@ -105,12 +105,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     SaveBusiness request = (SaveBusiness)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceInfoHandler.java	(working copy)
@@ -69,7 +69,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     ServiceInfo info = (ServiceInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     // required attribute
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DiscoveryURLsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DiscoveryURLsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DiscoveryURLsHandler.java	(working copy)
@@ -66,7 +66,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DiscoveryURLs discURLs = (DiscoveryURLs)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector discURLsVector = discURLs.getDiscoveryURLVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessDetailHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.Address;
 import org.apache.juddi.datatype.AddressLine;
 import org.apache.juddi.datatype.CategoryBag;
@@ -102,27 +101,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessDetail detail = (BusinessDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = detail.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = detail.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = detail.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetBusinessDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetBusinessDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetBusinessDetailHandler.java	(working copy)
@@ -68,12 +68,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetBusinessDetail request = (GetBusinessDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     Vector keyVector = request.getBusinessKeyVector();
     if ((keyVector!=null) && (keyVector.size() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelListHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelListHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelListHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.RegistryObject;
 import org.apache.juddi.datatype.response.TModelInfos;
 import org.apache.juddi.datatype.response.TModelList;
@@ -80,27 +79,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     TModelList list = (TModelList)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = list.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = list.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = list.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/KeyedReferenceHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/KeyedReferenceHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/KeyedReferenceHandler.java	(working copy)
@@ -55,7 +55,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     KeyedReference keyedRef = (KeyedReference)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String tModelKey = keyedRef.getTModelKey();
     if (tModelKey != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeletePublisherHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeletePublisherHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeletePublisherHandler.java	(working copy)
@@ -76,12 +76,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DeletePublisher request = (DeletePublisher)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AddPublisherAssertionsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AddPublisherAssertionsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AddPublisherAssertionsHandler.java	(working copy)
@@ -73,9 +73,12 @@
   public void marshal(RegistryObject object,Element parent)
   {
     AddPublisherAssertions request = (AddPublisherAssertions)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String nameSpace = getUDDINamespace(generic);
+    
+    Element element = parent.getOwnerDocument().createElementNS(nameSpace,TAG_NAME);
 
-    String generic = request.getGeneric();
     if (generic != null)
       element.setAttribute("generic",generic);
 
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindQualifierHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindQualifierHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindQualifierHandler.java	(working copy)
@@ -56,7 +56,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     FindQualifier qualifier = (FindQualifier)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String qValue = qualifier.getValue();
     if (qValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteServiceHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteServiceHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteServiceHandler.java	(working copy)
@@ -76,12 +76,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DeleteService request = (DeleteService)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInfosHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInfosHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInfosHandler.java	(working copy)
@@ -63,7 +63,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     TModelInfos infos = (TModelInfos)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector vector = infos.getTModelInfoVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetRegistryInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetRegistryInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetRegistryInfoHandler.java	(working copy)
@@ -52,12 +52,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetRegistryInfo request = (GetRegistryInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
-
     String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
+    element.setAttribute("generic",generic);
+
     parent.appendChild(element);
   }
 
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RegistryInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RegistryInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RegistryInfoHandler.java	(working copy)
@@ -67,7 +67,10 @@
   public void marshal(RegistryObject object,Element parent)
   {
     RegistryInfo info = (RegistryInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = info.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Properties props = info.getProperties();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessListHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessListHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessListHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.RegistryObject;
 import org.apache.juddi.datatype.response.BusinessInfos;
 import org.apache.juddi.datatype.response.BusinessList;
@@ -79,27 +78,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessList list = (BusinessList)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = list.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = list.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = list.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/OverviewURLHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/OverviewURLHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/OverviewURLHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     OverviewURL overURL = (OverviewURL)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String urlValue = overURL.getValue();
     if (urlValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/UploadRegisterHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/UploadRegisterHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/UploadRegisterHandler.java	(working copy)
@@ -51,7 +51,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     UploadRegister uploadRegister = (UploadRegister)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String uploadRegisterValue = uploadRegister.getValue();
     if (uploadRegisterValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AssertionStatusItemHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AssertionStatusItemHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AssertionStatusItemHandler.java	(working copy)
@@ -88,7 +88,10 @@
   public void marshal(RegistryObject object,Element parent)
   {
     AssertionStatusItem item = (AssertionStatusItem)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+ 
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     CompletionStatus status = item.getCompletionStatus();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeletePublisherAssertionsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeletePublisherAssertionsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeletePublisherAssertionsHandler.java	(working copy)
@@ -74,12 +74,13 @@
   public void marshal(RegistryObject object, Element parent)
   {
     DeletePublisherAssertions request = (DeletePublisherAssertions) object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic", generic);
+    element.setAttribute("generic", generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindBusinessHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindBusinessHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindBusinessHandler.java	(working copy)
@@ -121,12 +121,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     FindBusiness request = (FindBusiness)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     int maxRows = request.getMaxRows();
     if (maxRows > 0)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/OverviewDocHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/OverviewDocHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/OverviewDocHandler.java	(working copy)
@@ -76,7 +76,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     OverviewDoc overDoc = (OverviewDoc)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector descrVector = overDoc.getDescriptionVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceListHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceListHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceListHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.RegistryObject;
 import org.apache.juddi.datatype.response.ServiceInfos;
 import org.apache.juddi.datatype.response.ServiceList;
@@ -80,27 +79,15 @@
   public void marshal(RegistryObject object,Element parent)
   {
     ServiceList list = (ServiceList)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = list.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = list.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
+    element.setAttribute("generic",namespace);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = list.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetBindingDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetBindingDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetBindingDetailHandler.java	(working copy)
@@ -65,12 +65,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetBindingDetail request = (GetBindingDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     Vector keyVector = request.getBindingKeyVector();
     if ((keyVector!=null) && (keyVector.size() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherHandler.java	(working copy)
@@ -123,7 +123,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Publisher publisher = (Publisher)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     // Attributes (required)
     String publisherID = publisher.getPublisherID();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingDetailHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.Description;
 import org.apache.juddi.datatype.OverviewDoc;
 import org.apache.juddi.datatype.RegistryObject;
@@ -87,27 +86,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BindingDetail detail = (BindingDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = detail.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = detail.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = detail.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceInfosHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceInfosHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceInfosHandler.java	(working copy)
@@ -63,7 +63,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     ServiceInfos infos = (ServiceInfos)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector vector = infos.getServiceInfoVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessDetailExtHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessDetailExtHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessDetailExtHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.RegistryObject;
 import org.apache.juddi.datatype.business.BusinessEntityExt;
 import org.apache.juddi.datatype.response.BusinessDetailExt;
@@ -79,27 +78,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessDetailExt detail = (BusinessDetailExt)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = detail.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = detail.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = detail.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetBusinessDetailExtHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetBusinessDetailExtHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetBusinessDetailExtHandler.java	(working copy)
@@ -65,12 +65,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetBusinessDetailExt request = (GetBusinessDetailExt)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     Vector keyVector = request.getBusinessKeyVector();
     if ((keyVector!=null) && (keyVector.size() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AbstractHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AbstractHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AbstractHandler.java	(working copy)
@@ -15,7 +15,9 @@
  */
 package org.apache.juddi.handler;
 
+import org.apache.juddi.IRegistry;
 
+
 /**
  * Base class for the request handler structures.
  *
@@ -23,4 +25,39 @@
  */
 public abstract class AbstractHandler implements IHandler
 {
-}
\ No newline at end of file
+	/** 
+	 * Helper function to set the generic version number 
+	 * to a default value when null or zero length.
+	 * 
+	 * @param generic version number
+	 * @return generic version number
+	 */
+	public String getGeneric(String generic)
+	{
+		if ((generic == null) || (generic.trim().length() == 0))
+	    {
+		  // Default to UDDI v2 values
+	      return IRegistry.UDDI_V2_GENERIC;
+	    }
+		return generic;
+	}
+	/**
+	 * Helper function to get the namespace given the generic
+	 * version number.
+	 * 
+	 * @param generic - the generic version number
+	 * @return the namespace String
+	 */
+	public String getUDDINamespace(String generic)
+	{
+		if (IRegistry.UDDI_V1_GENERIC.equals(generic)) {
+	        return IRegistry.UDDI_V1_NAMESPACE;
+		} else if (IRegistry.UDDI_V2_GENERIC.equals(generic)) {
+	        return IRegistry.UDDI_V2_NAMESPACE;
+	    } else if (IRegistry.UDDI_V3_GENERIC.equals(generic)) {
+	        return IRegistry.UDDI_V3_NAMESPACE;
+	    } else {// Default to UDDI v2 values
+	       return IRegistry.UDDI_V2_GENERIC;
+	    }
+	}
+}
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ErrInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ErrInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ErrInfoHandler.java	(working copy)
@@ -52,7 +52,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     ErrInfo errInfo = (ErrInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String errCode = errInfo.getErrCode();
     if (errCode != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/InstanceParmsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/InstanceParmsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/InstanceParmsHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     InstanceParms parms = (InstanceParms)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String parmsValue = parms.getValue();
     if (parmsValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteTModelHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteTModelHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteTModelHandler.java	(working copy)
@@ -76,12 +76,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DeleteTModel request = (DeleteTModel)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/KeysOwnedHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/KeysOwnedHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/KeysOwnedHandler.java	(working copy)
@@ -70,7 +70,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     KeysOwned keysOwned = (KeysOwned)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String fromKey = keysOwned.getFromKey();
     if ((fromKey != null) && (fromKey.length() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SavePublisherHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SavePublisherHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SavePublisherHandler.java	(working copy)
@@ -73,12 +73,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     SavePublisher request = (SavePublisher)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/CompletionStatusHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/CompletionStatusHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/CompletionStatusHandler.java	(working copy)
@@ -50,7 +50,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     CompletionStatus status = (CompletionStatus)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String statusValue = status.getValue();
     if (statusValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AuthInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AuthInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AuthInfoHandler.java	(working copy)
@@ -52,7 +52,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     AuthInfo info = (AuthInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String infoValue = info.getValue();
     if (infoValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveServiceHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveServiceHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveServiceHandler.java	(working copy)
@@ -85,12 +85,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     SaveService request = (SaveService)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RelatedBusinessesListHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RelatedBusinessesListHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RelatedBusinessesListHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.BusinessKey;
 import org.apache.juddi.datatype.RegistryObject;
 import org.apache.juddi.datatype.response.RelatedBusinessInfo;
@@ -87,27 +86,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     RelatedBusinessesList list = (RelatedBusinessesList)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = list.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = list.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = list.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInstanceInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInstanceInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInstanceInfoHandler.java	(working copy)
@@ -74,7 +74,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     TModelInstanceInfo tModInstInfo = (TModelInstanceInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String tModelKey = tModInstInfo.getTModelKey();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherAssertionHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherAssertionHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherAssertionHandler.java	(working copy)
@@ -72,13 +72,15 @@
   public void marshal(RegistryObject object,Element parent)
   {
     PublisherAssertion assertion = (PublisherAssertion)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String fromKey = assertion.getFromKey();
     if (fromKey != null)
     {
-      Element fkElement = parent.getOwnerDocument().createElement("fromKey");
+      Element fkElement = parent.getOwnerDocument().createElementNS(namespace,"fromKey");
       fkElement.appendChild(parent.getOwnerDocument().createTextNode(fromKey));
       element.appendChild(fkElement);
     }
@@ -86,7 +88,7 @@
     String toKey = assertion.getToKey();
     if (toKey != null)
     {
-      Element tkElement = parent.getOwnerDocument().createElement("toKey");
+      Element tkElement = parent.getOwnerDocument().createElementNS(namespace,"toKey");
       tkElement.appendChild(parent.getOwnerDocument().createTextNode(toKey));
       element.appendChild(tkElement);
     }
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AddressHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AddressHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AddressHandler.java	(working copy)
@@ -76,7 +76,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Address address = (Address)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String useType = address.getUseType();
     if ((useType != null) && (useType.trim().length() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RegistryExceptionHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RegistryExceptionHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RegistryExceptionHandler.java	(working copy)
@@ -90,7 +90,9 @@
   {
     RegistryException regEx = (RegistryException)object;
     Document document = parent.getOwnerDocument();
-    Element fault = document.createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element fault = document.createElementNS(namespace,TAG_NAME);
 
     String fCode = regEx.getFaultCode();
     if (fCode != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessEntityHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessEntityHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessEntityHandler.java	(working copy)
@@ -137,7 +137,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessEntity business = (BusinessEntity)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String businessKey = business.getBusinessKey();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DiscoveryURLHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DiscoveryURLHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DiscoveryURLHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DiscoveryURL discURL = (DiscoveryURL)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String useType = discURL.getUseType();
     if (useType != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/IdentifierBagHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/IdentifierBagHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/IdentifierBagHandler.java	(working copy)
@@ -63,7 +63,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     IdentifierBag categoryBag = (IdentifierBag)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector keyedRefVector = categoryBag.getKeyedReferenceVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelKeyHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelKeyHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelKeyHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     TModelKey key = (TModelKey)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String keyValue = key.getValue();
     if (keyValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SubscriptionKeyHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SubscriptionKeyHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SubscriptionKeyHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     SubscriptionKey key = (SubscriptionKey)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String keyValue = key.getValue();
     if (keyValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AddressLineHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AddressLineHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AddressLineHandler.java	(working copy)
@@ -59,7 +59,10 @@
   public void marshal(RegistryObject object,Element parent)
   {
     AddressLine line = (AddressLine)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String keyName = line.getKeyName();
     if ((keyName != null) && (keyName.trim().length() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DispositionReportHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DispositionReportHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DispositionReportHandler.java	(working copy)
@@ -77,27 +77,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DispositionReport report = (DispositionReport)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = report.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    // We could use the generic value to determine which
-    // version of UDDI we should follow to format the
-    // response XML. For now we'll simply send back a
-    // UDDI 2.0 formatted response.  - Steve
+    element.setAttribute("generic",generic);
 
-    String generic = report.getGeneric();
-    if (generic != null)
-    {
-      element.setAttribute("generic",generic);
-
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-
     String operator = report.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AuthTokenHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AuthTokenHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AuthTokenHandler.java	(working copy)
@@ -73,27 +73,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     AuthToken authToken = (AuthToken)object;
-    Element element = parent.getOwnerDocument().createElement(AuthTokenHandler.TAG_NAME);
+    String generic = authToken.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,AuthTokenHandler.TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = authToken.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = authToken.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetAuthTokenHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetAuthTokenHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetAuthTokenHandler.java	(working copy)
@@ -60,7 +60,10 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetAuthToken request = (GetAuthToken)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String cred = request.getCredential();
     if ((cred != null && (cred.length() > 0)))
@@ -70,9 +73,7 @@
     if ((userID != null && (userID.length() > 0)))
       element.setAttribute("userID",userID);
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     parent.appendChild(element);
   }
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveTModelHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveTModelHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveTModelHandler.java	(working copy)
@@ -86,12 +86,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     SaveTModel request = (SaveTModel)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetAssertionStatusReportHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetAssertionStatusReportHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetAssertionStatusReportHandler.java	(working copy)
@@ -73,12 +73,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetAssertionStatusReport request = (GetAssertionStatusReport)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetTModelDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetTModelDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetTModelDetailHandler.java	(working copy)
@@ -68,12 +68,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetTModelDetail request = (GetTModelDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     Vector keyVector = request.getTModelKeyVector();
     if ((keyVector!=null) && (keyVector.size() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AssertionStatusReportHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AssertionStatusReportHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AssertionStatusReportHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.KeyedReference;
 import org.apache.juddi.datatype.RegistryObject;
 import org.apache.juddi.datatype.response.AssertionStatusItem;
@@ -76,26 +75,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     AssertionStatusReport report = (AssertionStatusReport)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = report.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = report.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
-
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
+    element.setAttribute("generic",generic);
     
     String operator = report.getOperator();
     if (operator != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PersonNameHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PersonNameHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PersonNameHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     PersonName name = (PersonName)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String nameValue = name.getValue();
     if ((nameValue != null) && (nameValue.trim().length() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelDetailHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.CategoryBag;
 import org.apache.juddi.datatype.Description;
 import org.apache.juddi.datatype.IdentifierBag;
@@ -85,27 +84,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     TModelDetail detail = (TModelDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = detail.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = detail.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = detail.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PhoneHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PhoneHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PhoneHandler.java	(working copy)
@@ -55,7 +55,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Phone phone = (Phone)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String useType = phone.getUseType();
     if ((useType != null) && (useType.trim().length() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherInfoHandler.java	(working copy)
@@ -68,7 +68,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     PublisherInfo info = (PublisherInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String publisherID = info.getPublisherID();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceKeyHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceKeyHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceKeyHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     ServiceKey key = (ServiceKey)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String keyValue = key.getValue();
     if (keyValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ValidateValuesHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ValidateValuesHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ValidateValuesHandler.java	(working copy)
@@ -81,13 +81,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     ValidateValues request = (ValidateValues)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
-
+    element.setAttribute("generic",generic);
     Vector businessVector = request.getBusinessEntityVector();
     if ((businessVector!=null) && (businessVector.size() > 0))
     {
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherIDHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherIDHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherIDHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     PublisherID id = (PublisherID)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String idValue = id.getValue();
     if (idValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindBindingHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindBindingHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindBindingHandler.java	(working copy)
@@ -99,16 +99,17 @@
   public void marshal(RegistryObject object,Element parent)
   {
     FindBinding request = (FindBinding)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String key = request.getServiceKey();
     if (key != null)
       element.setAttribute("serviceKey",key);
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     int maxRows = request.getMaxRows();
     if (maxRows > 0)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ContactsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ContactsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ContactsHandler.java	(working copy)
@@ -73,7 +73,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Contacts contacts = (Contacts)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector contactVector = contacts.getContactVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInstanceDetailsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInstanceDetailsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInstanceDetailsHandler.java	(working copy)
@@ -66,7 +66,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     TModelInstanceDetails details = (TModelInstanceDetails)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector infoVector = details.getTModelInstanceInfoVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetPublisherDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetPublisherDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetPublisherDetailHandler.java	(working copy)
@@ -65,12 +65,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetPublisherDetail request = (GetPublisherDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     Vector idVector = request.getPublisherIDVector();
     if ((idVector!=null) && (idVector.size() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherDetailHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.RegistryObject;
 import org.apache.juddi.datatype.publisher.Publisher;
 import org.apache.juddi.datatype.response.PublisherDetail;
@@ -80,17 +79,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     PublisherDetail detail = (PublisherDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = detail.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = detail.getGeneric();
-    if (generic != null)
-    {
-      element.setAttribute("generic",generic);
-      element.setAttribute("xmlns",IRegistry.JUDDI_V1_NAMESPACE);
-    }
-    else
-      element.setAttribute("generic","");
+    element.setAttribute("generic",generic);
 
     String operator = detail.getOperator();
     if (operator != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetServiceDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetServiceDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetServiceDetailHandler.java	(working copy)
@@ -65,12 +65,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetServiceDetail request = (GetServiceDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     Vector keyVector = request.getServiceKeyVector();
     if ((keyVector!=null) && (keyVector.size() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DescriptionHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DescriptionHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DescriptionHandler.java	(working copy)
@@ -56,7 +56,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Description descr = (Description)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String langCode = descr.getLanguageCode();
     if ((langCode != null) && (langCode.trim().length() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingKeyHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingKeyHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingKeyHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BindingKey key = (BindingKey)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String keyValue = key.getValue();
     if (keyValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceDetailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceDetailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ServiceDetailHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.CategoryBag;
 import org.apache.juddi.datatype.Description;
 import org.apache.juddi.datatype.KeyedReference;
@@ -92,27 +91,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     ServiceDetail detail = (ServiceDetail)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = detail.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = detail.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
-
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
+    element.setAttribute("generic",generic);
+    
     String operator = detail.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SubscriptionHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SubscriptionHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SubscriptionHandler.java	(working copy)
@@ -58,7 +58,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Subscription subscription = (Subscription)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String subscriptionKey = subscription.getSubscriptionKey();
     if (subscriptionKey != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelHandler.java	(working copy)
@@ -105,7 +105,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     TModel tModel = (TModel)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String tModelKey = tModel.getTModelKey();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindTModelHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindTModelHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindTModelHandler.java	(working copy)
@@ -103,13 +103,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     FindTModel request = (FindTModel)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
+    
+    element.setAttribute("generic",generic);
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
-
     int maxRows = request.getMaxRows();
     if (maxRows > 0)
       element.setAttribute("maxRows",String.valueOf(maxRows));
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindRelatedBusinessesHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindRelatedBusinessesHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindRelatedBusinessesHandler.java	(working copy)
@@ -87,12 +87,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     FindRelatedBusinesses request = (FindRelatedBusinesses)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     int maxRows = request.getMaxRows();
     if (maxRows > 0)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingTemplatesHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingTemplatesHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BindingTemplatesHandler.java	(working copy)
@@ -70,7 +70,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BindingTemplates bindings = (BindingTemplates)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector bindingVector = bindings.getBindingTemplateVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherListHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherListHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherListHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.RegistryObject;
 import org.apache.juddi.datatype.response.PublisherInfo;
 import org.apache.juddi.datatype.response.PublisherInfos;
@@ -81,20 +80,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     PublisherList list = (PublisherList)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = list.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = list.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
-      element.setAttribute("xmlns",IRegistry.JUDDI_V1_NAMESPACE);
-    }
-    else // Default to UDDI v2 and jUDDI v1 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.JUDDI_V1_NAMESPACE);
-    }
+    element.setAttribute("generic",generic);
 
     String operator = list.getOperator();
     if (operator != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ContactHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ContactHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ContactHandler.java	(working copy)
@@ -106,7 +106,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Contact contact = (Contact)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String useType = contact.getUseType();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteBindingHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteBindingHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteBindingHandler.java	(working copy)
@@ -76,12 +76,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DeleteBinding request = (DeleteBinding)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/HostingRedirectorHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/HostingRedirectorHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/HostingRedirectorHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     HostingRedirector redirector = (HostingRedirector)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String bindingKey = redirector.getBindingKey();
     if (bindingKey != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelBagHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelBagHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelBagHandler.java	(working copy)
@@ -66,7 +66,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     TModelBag bag = (TModelBag)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector keyVector = bag.getTModelKeyVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessKeyHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessKeyHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessKeyHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessKey key = (BusinessKey)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String keyValue = key.getValue();
     if (keyValue != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindQualifiersHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindQualifiersHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindQualifiersHandler.java	(working copy)
@@ -66,7 +66,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     FindQualifiers qualifiers = (FindQualifiers)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector qVector = qualifiers.getFindQualifierVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetSubscriptionsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetSubscriptionsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetSubscriptionsHandler.java	(working copy)
@@ -68,12 +68,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetSubscriptions request = (GetSubscriptions)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     Vector keyVector = request.getSubscriptionKeyVector();
     if ((keyVector!=null) && (keyVector.size() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteSubscriptionHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteSubscriptionHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteSubscriptionHandler.java	(working copy)
@@ -76,13 +76,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DeleteSubscription request = (DeleteSubscription)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
+    element.setAttribute("generic",generic);
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
-
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
     {
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetPublisherAssertionsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetPublisherAssertionsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/GetPublisherAssertionsHandler.java	(working copy)
@@ -65,12 +65,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     GetPublisherAssertions request = (GetPublisherAssertions)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherAssertionsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherAssertionsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherAssertionsHandler.java	(working copy)
@@ -17,7 +17,6 @@
 
 import java.util.Vector;
 
-import org.apache.juddi.IRegistry;
 import org.apache.juddi.datatype.KeyedReference;
 import org.apache.juddi.datatype.RegistryObject;
 import org.apache.juddi.datatype.assertion.PublisherAssertion;
@@ -74,27 +73,14 @@
   public void marshal(RegistryObject object,Element parent)
   {
     PublisherAssertions assertions = (PublisherAssertions)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = assertions.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = assertions.getGeneric();
-    if ((generic != null) && (generic.trim().length() > 0))
-    {
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
-      if (generic.equals(IRegistry.UDDI_V1_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V1_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V2_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-      else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
-        element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
-    }
-    else // Default to UDDI v2 values
-    {
-      element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
-      element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
-    }
-
     String operator = assertions.getOperator();
     if (operator != null)
       element.setAttribute("operator",operator);
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RelatedBusinessInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RelatedBusinessInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RelatedBusinessInfoHandler.java	(working copy)
@@ -95,7 +95,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     RelatedBusinessInfo info = (RelatedBusinessInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String businessKey = info.getBusinessKey();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/InstanceDetailsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/InstanceDetailsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/InstanceDetailsHandler.java	(working copy)
@@ -84,7 +84,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     InstanceDetails instDet = (InstanceDetails)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
   Vector descrVector = instDet.getDescriptionVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AccessPointHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AccessPointHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/AccessPointHandler.java	(working copy)
@@ -53,7 +53,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     AccessPoint accessPoint = (AccessPoint)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     // Attributes
     String urlType = accessPoint.getURLType();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SharedRelationshipsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SharedRelationshipsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SharedRelationshipsHandler.java	(working copy)
@@ -68,7 +68,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     SharedRelationships relationships = (SharedRelationships)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String direction = relationships.getDirection();
     if ((direction != null && (direction.length() > 0)))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessServiceHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessServiceHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessServiceHandler.java	(working copy)
@@ -102,7 +102,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessService service = (BusinessService)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String serviceKey = service.getServiceKey();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteBusinessHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteBusinessHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DeleteBusinessHandler.java	(working copy)
@@ -78,12 +78,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DeleteBusiness request = (DeleteBusiness)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ResultHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ResultHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/ResultHandler.java	(working copy)
@@ -66,7 +66,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Result result = (Result)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     element.setAttribute("errno",String.valueOf(result.getErrno()));
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/NameHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/NameHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/NameHandler.java	(working copy)
@@ -57,7 +57,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Name name = (Name)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String langCode = name.getLanguageCode();
     if ((langCode != null) && (langCode.trim().length() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PropertyHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PropertyHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PropertyHandler.java	(working copy)
@@ -58,7 +58,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Property property = (Property)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String name = property.getName();
     if ((name != null) && (name.trim().length() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SetPublisherAssertionsHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SetPublisherAssertionsHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SetPublisherAssertionsHandler.java	(working copy)
@@ -73,12 +73,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     SetPublisherAssertions request = (SetPublisherAssertions)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/EmailHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/EmailHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/EmailHandler.java	(working copy)
@@ -55,7 +55,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     Email email = (Email)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     String useType = email.getUseType();
     if ((useType != null) && (useType.trim().length() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/CategoryBagHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/CategoryBagHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/CategoryBagHandler.java	(working copy)
@@ -66,7 +66,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     CategoryBag categoryBag = (CategoryBag)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
 
     Vector keyedRefVector = categoryBag.getKeyedReferenceVector();
     if ((keyedRefVector!=null) && (keyedRefVector.size() > 0))
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveBindingHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveBindingHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/SaveBindingHandler.java	(working copy)
@@ -80,12 +80,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     SaveBinding request = (SaveBinding)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessInfosHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessInfosHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessInfosHandler.java	(working copy)
@@ -66,7 +66,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessInfos infos = (BusinessInfos)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector vector = infos.getBusinessInfoVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RelatedBusinessInfosHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RelatedBusinessInfosHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/RelatedBusinessInfosHandler.java	(working copy)
@@ -63,7 +63,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     RelatedBusinessInfos infos = (RelatedBusinessInfos)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector vector = infos.getRelatedBusinessInfoVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DiscardAuthTokenHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DiscardAuthTokenHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/DiscardAuthTokenHandler.java	(working copy)
@@ -70,12 +70,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     DiscardAuthToken request = (DiscardAuthToken)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     AuthInfo authInfo = request.getAuthInfo();
     if (authInfo != null)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherInfosHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherInfosHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/PublisherInfosHandler.java	(working copy)
@@ -63,7 +63,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     PublisherInfos infos = (PublisherInfos)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector vector = infos.getPublisherInfoVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindPublisherHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindPublisherHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/FindPublisherHandler.java	(working copy)
@@ -83,12 +83,13 @@
   public void marshal(RegistryObject object,Element parent)
   {
     FindPublisher request = (FindPublisher)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = request.getGeneric();
+    generic = getGeneric(generic);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
-    String generic = request.getGeneric();
-    if (generic != null)
-      element.setAttribute("generic",generic);
+    element.setAttribute("generic",generic);
 
     int maxRows = request.getMaxRows();
     if (maxRows > 0)
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessServicesHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessServicesHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/BusinessServicesHandler.java	(working copy)
@@ -78,7 +78,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     BusinessServices services = (BusinessServices)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     Vector serviceVector = services.getBusinessServiceVector();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInfoHandler.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInfoHandler.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/handler/TModelInfoHandler.java	(working copy)
@@ -67,7 +67,9 @@
   public void marshal(RegistryObject object,Element parent)
   {
     TModelInfo info = (TModelInfo)object;
-    Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
+    String generic = getGeneric(null);
+    String namespace = getUDDINamespace(generic);
+    Element element = parent.getOwnerDocument().createElementNS(namespace,TAG_NAME);
     AbstractHandler handler = null;
 
     String tModelKey = info.getTModelKey();
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/util/jdbc/ConnectionManager.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/util/jdbc/ConnectionManager.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/util/jdbc/ConnectionManager.java	(working copy)
@@ -24,6 +24,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.datastore.jdbc.Database;
 import org.apache.juddi.registry.RegistryEngine;
 import org.apache.juddi.util.Config;
 
@@ -45,13 +46,24 @@
   public static Connection aquireConnection()
     throws SQLException
   {
+	  
     // Make sure we've got a DataSource first
     if (dataSource == null)
       dataSource = lookupDataSource();
 
     Connection conn = null;
-    if (dataSource != null)
+    if (dataSource != null) {
       conn = dataSource.getConnection();
+    } else {
+        //check if we wanted to use a dataSource
+        Boolean isUseDatasource =
+            Config.getBooleanProperty(RegistryEngine.PROPNAME_IS_USE_DATASOURCE,
+                RegistryEngine.DEFAULT_IS_USE_DATASOURCE);
+        if (!isUseDatasource) {
+        	//create jdbc connection
+        	conn = Database.aquireConnection();
+        }
+    }
 
     return conn;
   }
@@ -66,6 +78,17 @@
     if (dataSource != null)
       return dataSource;
 
+    //check if we wanted to use a dataSource
+    Boolean isUseDatasource =
+        Config.getBooleanProperty(RegistryEngine.PROPNAME_IS_USE_DATASOURCE,
+            RegistryEngine.DEFAULT_IS_USE_DATASOURCE);
+    if (!isUseDatasource) {
+    	log.info("Not using Datasource as " 
+    			+ RegistryEngine.PROPNAME_IS_USE_DATASOURCE + "=" 
+    			+ isUseDatasource);
+    	return dataSource;
+    }
+    
     // look it up.
     try
     {
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/util/Config.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/util/Config.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/util/Config.java	(working copy)
@@ -212,9 +212,14 @@
     boolean boolVal = defaultValue;
 
     String propValue = getStringProperty(key);
-    if ((propValue != null) && (propValue.equalsIgnoreCase("true")))
-      boolVal = true;
-
+    if (propValue != null) {
+    	if (propValue.equalsIgnoreCase("true")) {
+    		boolVal = true;
+    	} else if (propValue.equalsIgnoreCase("false")) {
+    		boolVal = false;
+    	}
+    }
+      
     return boolVal;
   }
 
Index: C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/util/Loader.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/util/Loader.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/java/org/apache/juddi/util/Loader.java	(working copy)
@@ -19,6 +19,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.net.URLClassLoader;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -141,13 +142,13 @@
   {
     Method method = null;
     try {
-      method = Thread.class.getMethod("getContextClassLoader",null);
+      method = Thread.class.getMethod("getContextClassLoader",(Class[])null);
     }
     catch (NoSuchMethodException e) {
       return null; // Using JDK 1.1 or earlier
     }
 
-    return (ClassLoader)method.invoke(Thread.currentThread(),null);
+    return (ClassLoader)method.invoke(Thread.currentThread(),(Object[])null);
   }
 
   /**
@@ -176,7 +177,6 @@
     if (null == clazz)
     {
       ClassLoader scl = ClassLoader.getSystemClassLoader();
-
       try
       {
         log.info("Using the System ClassLoader");
Index: C:/cygwin/home/kstam/dev/juddi/src/junit/org/apache/juddi/datastore/jdbc/Database.java
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/src/junit/org/apache/juddi/datastore/jdbc/Database.java	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/src/junit/org/apache/juddi/datastore/jdbc/Database.java	(working copy)
@@ -1,77 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juddi.datastore.jdbc;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
-/**
- * @author Steve Viens (sviens@apache.org)
- */
-public class Database
-{
-  // private reference to the jUDDI logger
-  private static Log log = LogFactory.getLog(Database.class);
-
-  private static final String JDBC_DRIVER_KEY = "juddi.jdbcDriver";
-  private static final String DEFAULT_JDBC_DRIVER = "com.mysql.jdbc.Driver";
-
-  private static final String JDBC_URL_KEY = "juddi.jdbcURL";
-  private static final String DEFAULT_JDBC_URL = "jdbc:mysql://localhost/juddi";
-
-  private static final String JDBC_USERNAME_KEY = "juddi.jdbcUser";
-  private static final String DEFAULT_JDBC_USERNAME = "juddi";
-
-  private static final String JDBC_PASSWORD_KEY = "juddi.jdbcPassword";
-  private static final String DEFAULT_JDBC_PASSWORD = "juddi";
-
-  /**
-   *
-   */
-  public static Connection aquireConnection()
-    throws SQLException
-  {
-    // grab the JDBC properties we'll need to setup 
-  	// the connection pool.
-  	
-    String jdbcDriver = System.getProperty(JDBC_DRIVER_KEY,DEFAULT_JDBC_DRIVER);
-    String jdbcURL = System.getProperty(JDBC_URL_KEY,DEFAULT_JDBC_URL);
-    String jdbcUser = System.getProperty(JDBC_USERNAME_KEY,DEFAULT_JDBC_USERNAME);
-    String jdbcPassword = System.getProperty(JDBC_PASSWORD_KEY,DEFAULT_JDBC_PASSWORD);
-
-    // make sure the JDBC Driver is loaded
-    
-    try {
-    	Class.forName(jdbcDriver);
-    }
-    catch(ClassNotFoundException cnfex) {
-      throw new SQLException("Could not locate JDBC Driver '" +
-      		jdbcDriver+"' in classpath: "+cnfex.getMessage());
-    }
-
-    // okay, get and return the connection
-    
-    Connection connection = 
-    	DriverManager.getConnection(jdbcURL,jdbcUser,jdbcPassword);
-    	
-    return connection;
-  }
-}
Index: C:/cygwin/home/kstam/dev/juddi/build.xml
===================================================================
--- C:/cygwin/home/kstam/dev/juddi/build.xml	(revision 449707)
+++ C:/cygwin/home/kstam/dev/juddi/build.xml	(working copy)
@@ -71,8 +71,8 @@
     <property name="compile.debug"       value="on"/>
     <property name="compile.deprecation" value="on"/>
     <property name="compile.optimize"    value="off"/>
-    <property name="compile.source"      value="1.4"/>
-    <property name="compile.target"      value="1.4"/>
+    <property name="compile.source"      value="1.5"/>
+    <property name="compile.target"      value="1.5"/>
     <property name="test.failonerror"    value="true" />
     <property name="test.runner"         value="junit.textui.TestRunner"/>