You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/08/23 21:52:46 UTC
svn commit: r1517008 - in /juddi/trunk:
juddi-client.net/juddi-client.net/bindings/
juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/
juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/
juddi-client.net/juddi-client....
Author: alexoree
Date: Fri Aug 23 19:52:45 2013
New Revision: 1517008
URL: http://svn.apache.org/r1517008
Log:
JUDDI-637 updating source code docs
JUDDI-567 fixing a build issue and cleaning up most of the compiler warnings
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/bindings/ext.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/BackgroundRegistration.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Properties.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Property.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/TokenResolver.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClerk.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClientContainer.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIKeyConvention.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDINode.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XRegistration.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XmlConfiguration.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client-ext.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/Cryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/Log.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIConstants.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIService.cs
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java
Modified: juddi/trunk/juddi-client.net/juddi-client.net/bindings/ext.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/bindings/ext.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/bindings/ext.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/bindings/ext.cs Fri Aug 23 19:52:45 2013
@@ -1,11 +1,25 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+/*
+ * Copyright 2001-2013 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.
+ *
+ */
+using System;
+/// This extends the generated classes with helper functions
+/// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
namespace org.uddi.apiv3
{
- /// <remarks/>
public partial class name
{
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/BackgroundRegistration.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/BackgroundRegistration.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/BackgroundRegistration.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/BackgroundRegistration.cs Fri Aug 23 19:52:45 2013
@@ -16,37 +16,42 @@
*/
using org.apache.juddi.v3.client.log;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace org.apache.juddi.v3.client.config
{
class BackGroundRegistration
{
- private UDDIClient uddiClient = null;
- private static Log log = LogFactory.getLog(typeof(BackGroundRegistration));
-
- public BackGroundRegistration(UDDIClient manager) {
- //super();
- this.uddiClient = manager;
- }
+ private UDDIClient uddiClient = null;
+ private static Log log = LogFactory.getLog(typeof(BackGroundRegistration));
- public void run() {
- try {
- if (UDDIClientContainer.getUDDIClient(uddiClient.getName())!=null && uddiClient.getClientConfig().isRegisterOnStartup()) {
- log.debug("Starting UDDI Clerks for uddiClient " + uddiClient.getClientConfig().getClientName() + "...");
- uddiClient.saveClerkAndNodeInfo();
- uddiClient.registerAnnotatedServices();
- uddiClient.registerWSDLs();
- uddiClient.xRegister();
- log.debug("Clerks started succesfully for uddiClient " + uddiClient.getClientConfig().getClientName());
- } else {
- log.debug(uddiClient.getName() + " already registered to the UDDIClientContainer.");
- }
- } catch (Exception e) {
- log.error(e.Message,e);
- }
- }
+ public BackGroundRegistration(UDDIClient manager)
+ {
+ //super();
+ this.uddiClient = manager;
+ }
+
+ public void run()
+ {
+ try
+ {
+ if (UDDIClientContainer.getUDDIClient(uddiClient.getName()) != null && uddiClient.getClientConfig().isRegisterOnStartup())
+ {
+ log.debug("Starting UDDI Clerks for uddiClient " + uddiClient.getClientConfig().getClientName() + "...");
+ uddiClient.saveClerkAndNodeInfo();
+ uddiClient.registerAnnotatedServices();
+ uddiClient.registerWSDLs();
+ uddiClient.xRegister();
+ log.debug("Clerks started succesfully for uddiClient " + uddiClient.getClientConfig().getClientName());
+ }
+ else
+ {
+ log.debug(uddiClient.getName() + " already registered to the UDDIClientContainer.");
+ }
+ }
+ catch (Exception e)
+ {
+ log.error(e.Message, e);
+ }
+ }
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs Fri Aug 23 19:52:45 2013
@@ -25,10 +25,15 @@ using System.Xml;
namespace org.apache.juddi.v3.client.config
{
+ /// <summary>
+ /// This class handles the loading of configuration file data from disk, typically from either a caller
+ /// specified file, "uddi.xml" in the current directory, or from a System Environment variable "uddi.client.xml"
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class ClientConfig
{
private readonly static String UDDI_CONFIG_FILENAME_PROPERTY = "uddi.client.xml";
- public readonly static String DEFAULT_UDDI_CONFIG = "META-INF/uddi.xml";
+ public readonly static String DEFAULT_UDDI_CONFIG = "uddi.xml";
private Log log = LogFactory.getLog(typeof(ClientConfig));
private uddi config = null;
private Dictionary<String, UDDINode> uddiNodes = null;
@@ -123,7 +128,7 @@ namespace org.apache.juddi.v3.client.con
uddiClerk.setManagerName(clientName);
uddiClerk.setName(config.client.clerks.clerk[i].name);
String nodeRef = config.client.clerks.clerk[i].node;
- if (!uddiNodes.ContainsKey(nodeRef)) throw new ConfigurationException("Could not find Node with name=" + nodeRef);
+ if (!uddiNodes.ContainsKey(nodeRef)) throw new ConfigurationErrorsException("Could not find Node with name=" + nodeRef);
UDDINode uddiNode = uddiNodes[nodeRef];
uddiClerk.setUDDInode(uddiNode);
uddiClerk.setPublisher(config.client.clerks.clerk[i].publisher);
@@ -161,7 +166,7 @@ namespace org.apache.juddi.v3.client.con
if (keyDomain == null) keyDomain = clerkKeyDomain;
if (keyDomain == null) keyDomain = uddiClerk.getUDDINode().getProperties().getString("keyDomain");
if ((businessName == null && !uddiClerk.getUDDINode().getProperties().containsKey("businessName"))
- || keyDomain == null && !uddiClerk.getUDDINode().getProperties().containsKey("keyDomain")) throw new ConfigurationException("Either the wsdl(" + wsdls[w]
+ || keyDomain == null && !uddiClerk.getUDDINode().getProperties().containsKey("keyDomain")) throw new ConfigurationErrorsException("Either the wsdl(" + wsdls[w]
+ ") or clerk (" + uddiClerk.getName() + ") elements require a businessKey, or businessName & keyDomain attributes");
else
{
@@ -173,7 +178,7 @@ namespace org.apache.juddi.v3.client.con
}
if (!businessKey.ToLower().StartsWith("uddi:") || !businessKey.Substring(5).Contains(":"))
{
- throw new ConfigurationException("The businessKey " + businessKey + " does not implement a valid UDDI v3 key format.");
+ throw new ConfigurationErrorsException("The businessKey " + businessKey + " does not implement a valid UDDI v3 key format.");
}
wsdl.setBusinessKey(businessKey);
if (keyDomain == null)
@@ -265,12 +270,12 @@ namespace org.apache.juddi.v3.client.con
xRegistration.setEntityKey(config.client.clerks.xregister.business[i].bindingKey);
String fromClerkRef = config.client.clerks.xregister.business[i].fromClerk;
- if (!clerks.ContainsKey(fromClerkRef)) throw new ConfigurationException("Could not find fromClerk with name=" + fromClerkRef);
+ if (!clerks.ContainsKey(fromClerkRef)) throw new ConfigurationErrorsException("Could not find fromClerk with name=" + fromClerkRef);
UDDIClerk fromClerk = clerks[(fromClerkRef)];
xRegistration.setFromClerk(fromClerk);
String toClerkRef = config.client.clerks.xregister.business[i].toClerk;
- if (!clerks.ContainsKey(toClerkRef)) throw new ConfigurationException("Could not find toClerk with name=" + toClerkRef);
+ if (!clerks.ContainsKey(toClerkRef)) throw new ConfigurationErrorsException("Could not find toClerk with name=" + toClerkRef);
UDDIClerk toClerk = clerks[(toClerkRef)];
xRegistration.setToClerk(toClerk);
log.debug(xRegistration);
@@ -299,12 +304,12 @@ namespace org.apache.juddi.v3.client.con
xRegistration.setEntityKey(config.client.clerks.xregister.servicebinding[i].bindingKey);
String fromClerkRef = config.client.clerks.xregister.servicebinding[i].fromClerk;
- if (!clerks.ContainsKey(fromClerkRef)) throw new ConfigurationException("Could not find fromClerk with name=" + fromClerkRef);
+ if (!clerks.ContainsKey(fromClerkRef)) throw new ConfigurationErrorsException("Could not find fromClerk with name=" + fromClerkRef);
UDDIClerk fromClerk = clerks[(fromClerkRef)];
xRegistration.setFromClerk(fromClerk);
String toClerkRef = config.client.clerks.xregister.servicebinding[i].toClerk;
- if (!clerks.ContainsKey(toClerkRef)) throw new ConfigurationException("Could not find toClerk with name=" + toClerkRef);
+ if (!clerks.ContainsKey(toClerkRef)) throw new ConfigurationErrorsException("Could not find toClerk with name=" + toClerkRef);
UDDIClerk toClerk = clerks[(toClerkRef)];
xRegistration.setToClerk(toClerk);
log.debug(xRegistration);
@@ -321,7 +326,7 @@ namespace org.apache.juddi.v3.client.con
public UDDINode getHomeNode()
{
- if (uddiNodes == null) throw new ConfigurationException("The juddi client configuration " +
+ if (uddiNodes == null) throw new ConfigurationErrorsException("The juddi client configuration " +
"must contain at least one node element.");
if (uddiNodes.Values.Count == 1)
{
@@ -336,14 +341,14 @@ namespace org.apache.juddi.v3.client.con
return uddiNode;
}
}
- throw new ConfigurationException("One of the node elements in the client configuration needs to a 'isHomeJUDDI=\"true\"' attribute.");
+ throw new ConfigurationErrorsException("One of the node elements in the client configuration needs to a 'isHomeJUDDI=\"true\"' attribute.");
}
public UDDINode getUDDINode(String nodeName)
{
if (!uddiNodes.ContainsKey(nodeName))
{
- throw new ConfigurationException("Node '" + nodeName
+ throw new ConfigurationErrorsException("Node '" + nodeName
+ "' cannot be found in the config '" + getClientName() + "'");
}
return uddiNodes[nodeName];
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Properties.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Properties.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Properties.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Properties.cs Fri Aug 23 19:52:45 2013
@@ -23,8 +23,9 @@ using System.Text;
namespace org.apache.juddi.v3.client.config
{
/// <summary>
- /// This class behaves similiary to Apache Commons Config class
+ /// This class behaves similiary to Java Properties class and was created to simply the port
/// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class Properties
{
Log log = LogFactory.getLog("Properties");
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Property.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Property.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Property.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/Property.cs Fri Aug 23 19:52:45 2013
@@ -21,16 +21,21 @@ using System.Text;
namespace org.apache.juddi.v3.client.config
{
+ /// <summary>
+ /// Contains a listing of "properties" ported over from the Java juddi-client
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class Property
{
- public readonly static String UDDI_RELOAD_DELAY = "reloadDelay";
+ /*
+ public readonly static String UDDI_RELOAD_DELAY = "reloadDelay";
public readonly static String UDDI_PROXY_FACTORY_INITIAL = "java.naming.factory.initial";
public readonly static String UDDI_PROXY_PROVIDER_URL = "java.naming.provider.url";
public readonly static String UDDI_PROXY_FACTORY_URL_PKS = "java.naming.factory.url.pkgs";
public readonly static String DEFAULT_UDDI_PROXY_TRANSPORT = "org.uddi.api_v3.client.transport.JAXWSTransport";
-
+ */
//Properties that can be set in the uddi.xml
public static readonly String LANG = "lang";
public static readonly String BUSINESS_KEY = "businessKey";
@@ -45,7 +50,7 @@ namespace org.apache.juddi.v3.client.con
public static readonly String BINDING_CATEGORY_BAG = "bindingCategoryBag";
public static readonly String BASIC_AUTH_USERNAME = "basicAuthUsername";
public static readonly String BASIC_AUTH_PASSWORD = "basicAuthPassword";
-
+
//Default Values
public static readonly String DEFAULT_LANG = "en";
public static readonly String DEFAULT_SERVICE_DESCRIPTION = "Default service description when no <wsdl:document> element is defined inside the <wsdl:service> element.";
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/TokenResolver.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/TokenResolver.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/TokenResolver.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/TokenResolver.cs Fri Aug 23 19:52:45 2013
@@ -16,9 +16,6 @@
*/
using org.apache.juddi.v3.client.log;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Text.RegularExpressions;
namespace org.apache.juddi.v3.client.config
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClerk.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClerk.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClerk.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClerk.cs Fri Aug 23 19:52:45 2013
@@ -26,6 +26,10 @@ using System.Text;
namespace org.apache.juddi.v3.client.config
{
+ /// <summary>
+ ///
+ /// </summary>
+ ///
public class UDDIClerk
{
@@ -595,7 +599,7 @@ namespace org.apache.juddi.v3.client.con
businessService[] businessServiceList = sd.businessService;
if (businessServiceList.Length == 0)
{
- throw new ConfigurationException("Could not find Service with key=" + serviceKey);
+ throw new ConfigurationErrorsException("Could not find Service with key=" + serviceKey);
}
return businessServiceList[0];
}
@@ -625,7 +629,7 @@ namespace org.apache.juddi.v3.client.con
bindingTemplate[] bindingTemplateList = bd.bindingTemplate;
if (bindingTemplateList.Length == 0)
{
- throw new ConfigurationException("Could not find ServiceBinding with key=" + bindingKey);
+ throw new ConfigurationErrorsException("Could not find ServiceBinding with key=" + bindingKey);
}
return bindingTemplateList[0];
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs Fri Aug 23 19:52:45 2013
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 The Apache Software Foundation.
+ * Copyright 2001-2013 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.
@@ -26,6 +26,10 @@ using System.Configuration;
namespace org.apache.juddi.v3.client
{
+ /// <summary>
+ ///
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class UDDIClient
{
@@ -120,7 +124,7 @@ namespace org.apache.juddi.v3.client
EmbeddedRegistry embeddedRegistry = (EmbeddedRegistry) clazz.newInstance();
embeddedRegistry.start();
} catch (Exception e) {
- throw new ConfigurationException(e.Message,e);
+ throw new ConfigurationErrorsException(e.Message,e);
}*/
}
@@ -133,7 +137,7 @@ namespace org.apache.juddi.v3.client
EmbeddedRegistry embeddedRegistry = (EmbeddedRegistry) clazz.newInstance();
embeddedRegistry.stop();
} catch (Exception e) {
- throw new ConfigurationException(e.Message,e);
+ throw new ConfigurationErrorsException(e.Message,e);
}*/
}
@@ -315,9 +319,8 @@ namespace org.apache.juddi.v3.client
String managerName = clientConfig.getClientName();
return new AspNetTransport(managerName, nodeName, this.getClientConfig());
} catch (Exception e) {
- throw new ConfigurationException (e.Message,e);
+ throw new ConfigurationErrorsException(e.Message,e);
}
- return null;
}
public UDDIClerk getClerk(String clerkName)
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClientContainer.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClientContainer.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClientContainer.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClientContainer.cs Fri Aug 23 19:52:45 2013
@@ -14,12 +14,10 @@
* limitations under the License.
*
*/
-using juddi_dotnet.org.apache.juddi.v3.client;
using org.apache.juddi.v3.client.log;
using System;
using System.Collections.Generic;
using System.Configuration;
-using System.Text;
namespace org.apache.juddi.v3.client
{
@@ -39,7 +37,7 @@ namespace org.apache.juddi.v3.client
}
else
{
- throw new ConfigurationException("No client by name " + clientName + " was found. " +
+ throw new ConfigurationErrorsException("No client by name " + clientName + " was found. " +
" Please check your client uddi.xml files, and make sure this client was started");
}
}
@@ -90,7 +88,7 @@ namespace org.apache.juddi.v3.client
}
else
{
- throw new ConfigurationException("Could not remove UDDIClient for name " + clientName);
+ throw new ConfigurationErrorsException("Could not remove UDDIClient for name " + clientName);
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIKeyConvention.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIKeyConvention.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIKeyConvention.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIKeyConvention.cs Fri Aug 23 19:52:45 2013
@@ -15,105 +15,105 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace org.apache.juddi.v3.client.config
{
-
-public class UDDIKeyConvention
-{
-
- //Default Values
- public static readonly String DEFAULT_BUSINESS_KEY_FORMAT = "uddi:${keyDomain}:business_${businessName}";
- public static readonly String DEFAULT_SERVICE_KEY_FORMAT = "uddi:${keyDomain}:service_${serviceName}";
- public static readonly String DEFAULT_SUBSCRIPTION_KEY_FORMAT = "uddi:${keyDomain}:service_cache_${serverName}";
- public static readonly String DEFAULT_BINDING_KEY_FORMAT = "uddi:${keyDomain}:binding_${serverName}_${serviceName}_${portName}_${serverPort}";
-
- /**
- * Constructs the serviceKey based on the bindingKeyFormat specified in the properties. When no
- * businessKeyFormat is specific the default format of uddi:${keyDomain}:${businessName} is used. The businessName
- * property needs to be set properties.
- *
- * @param properties
- * @return the businessKey
- */
- public static String getBusinessKey(Properties properties) {
- String businessKey = properties.getProperty(Property.BUSINESS_KEY);
- if (businessKey==null) {
- String keyFormat = properties.getProperty(Property.BUSINESS_KEY_FORMAT, DEFAULT_BUSINESS_KEY_FORMAT);
- businessKey = TokenResolver.replaceTokens(keyFormat, properties).ToLower();
- }
- return businessKey;
- }
-
- public static String getSubscriptionKey(Properties properties) {
- String keyFormat = properties.getProperty(Property.SUBSCRIPTION_KEY_FORMAT, DEFAULT_SUBSCRIPTION_KEY_FORMAT);
- String subscriptionKey = TokenResolver.replaceTokens(keyFormat, properties).ToLower();
- return subscriptionKey;
- }
- /**
- * Constructs the serviceKey based on the serviceKeyFormat specified in the properties. When no
- * serviceKeyFormat is specific the default format of uddi:${keyDomain}:${serviceName} is used.
- *
- * @param properties
- * @param serviceName
- * @return the serviceKey
- */
- public static String getServiceKey(Properties properties, String serviceName) {
- Properties tempProperties = new Properties();
- tempProperties.putAll(properties);
- tempProperties.put("serviceName", serviceName);
- //Constructing the serviceKey
- String keyFormat = tempProperties.getProperty(Property.SERVICE_KEY_FORMAT, DEFAULT_SERVICE_KEY_FORMAT);
- String serviceKey = TokenResolver.replaceTokens(keyFormat, tempProperties).ToLower();
- return serviceKey;
- }
-
- /*public static String getBindingKey(Properties properties, QName serviceName, String portName, URL bindingUrl) {
+
+ public class UDDIKeyConvention
+ {
+
+ //Default Values
+ public static readonly String DEFAULT_BUSINESS_KEY_FORMAT = "uddi:${keyDomain}:business_${businessName}";
+ public static readonly String DEFAULT_SERVICE_KEY_FORMAT = "uddi:${keyDomain}:service_${serviceName}";
+ public static readonly String DEFAULT_SUBSCRIPTION_KEY_FORMAT = "uddi:${keyDomain}:service_cache_${serverName}";
+ public static readonly String DEFAULT_BINDING_KEY_FORMAT = "uddi:${keyDomain}:binding_${serverName}_${serviceName}_${portName}_${serverPort}";
+
+ /// <summary>
+ /// Constructs the serviceKey based on the bindingKeyFormat specified in the properties. When no
+ /// businessKeyFormat is specific the default format of uddi:${keyDomain}:${businessName} is used. The businessName
+ /// property needs to be set properties.
+ /// </summary>
+ /// <param name="properties"></param>
+ /// <returns></returns>
+ public static String getBusinessKey(Properties properties)
+ {
+ String businessKey = properties.getProperty(Property.BUSINESS_KEY);
+ if (businessKey == null)
+ {
+ String keyFormat = properties.getProperty(Property.BUSINESS_KEY_FORMAT, DEFAULT_BUSINESS_KEY_FORMAT);
+ businessKey = TokenResolver.replaceTokens(keyFormat, properties).ToLower();
+ }
+ return businessKey;
+ }
+
+ public static String getSubscriptionKey(Properties properties)
+ {
+ String keyFormat = properties.getProperty(Property.SUBSCRIPTION_KEY_FORMAT, DEFAULT_SUBSCRIPTION_KEY_FORMAT);
+ String subscriptionKey = TokenResolver.replaceTokens(keyFormat, properties).ToLower();
+ return subscriptionKey;
+ }
+
+ /// <summary>
+ /// Constructs the serviceKey based on the serviceKeyFormat specified in the properties. When no
+ ///serviceKeyFormat is specific the default format of uddi:${keyDomain}:${serviceName} is used.
+ /// </summary>
+ /// <param name="properties"></param>
+ /// <param name="serviceName"></param>
+ /// <returns></returns>
+ public static String getServiceKey(Properties properties, String serviceName)
+ {
+ Properties tempProperties = new Properties();
+ tempProperties.putAll(properties);
+ tempProperties.put("serviceName", serviceName);
+ //Constructing the serviceKey
+ String keyFormat = tempProperties.getProperty(Property.SERVICE_KEY_FORMAT, DEFAULT_SERVICE_KEY_FORMAT);
+ String serviceKey = TokenResolver.replaceTokens(keyFormat, tempProperties).ToLower();
+ return serviceKey;
+ }
+
+ /*public static String getBindingKey(Properties properties, QName serviceName, String portName, URL bindingUrl) {
- String bindingKey = null;
- try {
- URI bindingURI = bindingUrl.toURI();
- bindingKey = getBindingKey(properties, serviceName, portName, bindingURI);
- } catch (URISyntaxException e) {
+ String bindingKey = null;
+ try {
+ URI bindingURI = bindingUrl.toURI();
+ bindingKey = getBindingKey(properties, serviceName, portName, bindingURI);
+ } catch (URISyntaxException e) {
- }
- return bindingKey;
+ }
+ return bindingKey;
- }*/
+ }*/
- /**
- * Constructs the bindingKey based on the bindingKeyFormat specified in the properties. When no
- * bindingKeyFormat is specific the default format of uddi:${keyDomain}:${nodeName}-${serviceName}-{portName} is used.
- *
- * @param properties
- * @param serviceName
- * @param portName
- * @return the bindingKey
+ /**
+ * Constructs the bindingKey based on the bindingKeyFormat specified in the properties. When no
+ * bindingKeyFormat is specific the default format of uddi:${keyDomain}:${nodeName}-${serviceName}-{portName} is used.
+ *
+ * @param properties
+ * @param serviceName
+ * @param portName
+ * @return the bindingKey
- public static String getBindingKey(Properties properties, QName serviceName, String portName, URI bindingUrl) {
- Properties tempProperties = new Properties();
- tempProperties.putAll(properties);
- tempProperties.put("serviceName", serviceName.getLocalPart());
- tempProperties.put("portName", portName);
- int port = bindingUrl.getPort();
- if (port==-1) {
- if ("http".equals(bindingUrl.getScheme())) {
- port = 80;
- } else if ("https".equals(bindingUrl.getScheme())) {
- port = 443;
+ public static String getBindingKey(Properties properties, QName serviceName, String portName, URI bindingUrl) {
+ Properties tempProperties = new Properties();
+ tempProperties.putAll(properties);
+ tempProperties.put("serviceName", serviceName.getLocalPart());
+ tempProperties.put("portName", portName);
+ int port = bindingUrl.getPort();
+ if (port==-1) {
+ if ("http".equals(bindingUrl.getScheme())) {
+ port = 80;
+ } else if ("https".equals(bindingUrl.getScheme())) {
+ port = 443;
+ }
}
- }
- tempProperties.put("serverPort", String.valueOf(port));
- //Constructing the binding Key
- String keyFormat = properties.getProperty(Property.BINDING_KEY_FORMAT, DEFAULT_BINDING_KEY_FORMAT);
- String bindingKey = TokenResolver.replaceTokens(keyFormat, tempProperties).toLowerCase();
- return bindingKey;
- } */
-}
+ tempProperties.put("serverPort", String.valueOf(port));
+ //Constructing the binding Key
+ String keyFormat = properties.getProperty(Property.BINDING_KEY_FORMAT, DEFAULT_BINDING_KEY_FORMAT);
+ String bindingKey = TokenResolver.replaceTokens(keyFormat, tempProperties).toLowerCase();
+ return bindingKey;
+ } */
+ }
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDINode.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDINode.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDINode.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDINode.cs Fri Aug 23 19:52:45 2013
@@ -17,17 +17,16 @@
using org.apache.juddi.apiv3;
using org.apache.juddi.v3.client.transport;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace org.apache.juddi.v3.client.config
{
+ /// <summary>
+ /// Represents a specific UDDI server, which is the set of services defined by the specification
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class UDDINode
{
-
-
private Properties properties;
private Transport transport;
@@ -106,7 +105,8 @@ namespace org.apache.juddi.v3.client.con
{
if (transport == null)
{
- return new AspNetTransport();
+ transport = new AspNetTransport();
+
}
return transport;
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XRegistration.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XRegistration.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XRegistration.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XRegistration.cs Fri Aug 23 19:52:45 2013
@@ -23,6 +23,10 @@ using System.Text;
namespace org.apache.juddi.v3.client.config
{
+ /// <summary>
+ ///
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class XRegistration
{
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XmlConfiguration.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XmlConfiguration.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XmlConfiguration.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/XmlConfiguration.cs Fri Aug 23 19:52:45 2013
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 The Apache Software Foundation.
+ * Copyright 2001-2013 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.
@@ -16,34 +16,34 @@
*/
using org.apache.juddi.v3.client.log;
using System;
-using System.Collections.Generic;
using System.IO;
-using System.Linq;
-using System.Text;
-using System.Xml;
using System.Xml.Serialization;
-using System.Xml.XPath;
namespace org.apache.juddi.v3.client.config
{
- public static class XmlConfiguration
+ /// <summary>
+ /// The XmlConfiguration class was originally going to be a port of the Apache Commons Configuration, however to make things easier
+ /// the juddi-client.xsd file was used to generate c# code representing the expected settings from the Java juddi-client.
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
+ public static class XmlConfiguration
{
public static uddi LoadXmlConfiguration(string filename)
{
- String content = File.ReadAllText(filename);
- using (StringReader sr = new StringReader(content))
- {
- try
- {
- XmlSerializer xs = new XmlSerializer(typeof(uddi));
- return xs.Deserialize(sr) as uddi;
- }
- catch (Exception ex)
- {
- LogFactory.getLog(typeof(XmlConfiguration)).error("Error loading config file from " + filename + " ", ex);
- throw ex;
- }
- }
+ String content = File.ReadAllText(filename);
+ using (StringReader sr = new StringReader(content))
+ {
+ try
+ {
+ XmlSerializer xs = new XmlSerializer(typeof(uddi));
+ return xs.Deserialize(sr) as uddi;
+ }
+ catch (Exception ex)
+ {
+ LogFactory.getLog(typeof(XmlConfiguration)).error("Error loading config file from " + filename + " ", ex);
+ throw ex;
+ }
+ }
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client-ext.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client-ext.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client-ext.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client-ext.cs Fri Aug 23 19:52:45 2013
@@ -19,8 +19,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
+/// extends the generated uddi-client codebase, which is generated via the xsd tool from juddi-client.xsd in the Java project
+///<author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
namespace org.apache.juddi.v3.client.config
{
+
public partial class uddi
{
Properties p = new Properties();
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs Fri Aug 23 19:52:45 2013
@@ -21,6 +21,10 @@ using System.Text;
namespace org.apache.juddi.v3.client.crypto
{
+ /// <summary>
+ /// AES128 Cipher
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
internal sealed class AES128Cryptor : AESCryptor
{
protected internal override int GetKeySize()
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs Fri Aug 23 19:52:45 2013
@@ -22,6 +22,10 @@ using System.Text;
namespace org.apache.juddi.v3.client.crypto
{
+ /// <summary>
+ /// AES256 Cipher
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
internal sealed class AES256Cryptor : AESCryptor
{
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs Fri Aug 23 19:52:45 2013
@@ -23,6 +23,12 @@ using System.Text;
namespace org.apache.juddi.v3.client.crypto
{
+ /// <summary>
+ /// An abstract class for AES functions
+ /// </summary>
+ /// <see cref="AES128"/>
+ /// <see cref="AES256"/>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
internal abstract class AESCryptor : Cryptor
{
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/Cryptor.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/Cryptor.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/Cryptor.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/Cryptor.cs Fri Aug 23 19:52:45 2013
@@ -21,25 +21,28 @@ using System.Text;
namespace org.apache.juddi.v3.client.crypto
{
+ /// <summary>
+ /// The Crpytor interface, used for encrypting and decrypted credentials
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public interface Cryptor
{
- /**
- * Encrypt the string, if unable to encrypt, return null
- */
+
+
+
+ /// <summary>
+ /// Encrypt the string, if unable to encrypt, return null
+ /// </summary>
+ /// <param name="str"></param>
+ /// <returns>encrypted string</returns>
String encrypt(String str);
- /**
- * decrypts the string
- * @param str
- * @return, if the password can be decrypted, the decrypted value is returned, otherwise the original value is returned<br>
- * In the event that decryption fails, the error message must be logged.
- * @throws NoSuchPaddingException
- * @throws NoSuchAlgorithmException
- * @throws InvalidAlgorithmParameterException
- * @throws InvalidKeyException
- * @throws IllegalBlockSizeException
- * @throws BadPaddingException
- */
- String decrypt(String str);
+ /// <summary>
+ /// decrypts the string
+ /// </summary>
+ /// <param name="str"></param>
+ /// <returns>if the password can be decrypted, the decrypted value is returned, otherwise the original value is returned<br>
+ ///In the event that decryption fails, the error message must be logged.</returns>
+ String decrypt(String str);
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs Fri Aug 23 19:52:45 2013
@@ -22,6 +22,10 @@ using System.Text;
namespace org.apache.juddi.v3.client.crypto
{
+ /// <summary>
+ /// loads the appropriate cipher
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class CryptorFactory
{
static Dictionary<String, Cryptor> cache = new Dictionary<string, Cryptor>();
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs Fri Aug 23 19:52:45 2013
@@ -23,6 +23,10 @@ using System.Text;
namespace org.apache.juddi.v3.client.crypto
{
+ /// <summary>
+ /// 3DES Ciphers
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
internal sealed class TripleDESCryptor : Cryptor
{
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs Fri Aug 23 19:52:45 2013
@@ -1,5 +1,5 @@
-/*
- * Copyright 2001-2008 The Apache Software Foundation.
+/*/*
+ * Copyright 2001-2013 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.
@@ -16,9 +16,6 @@
*/
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace org.apache.juddi.v3.client.log
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs Fri Aug 23 19:52:45 2013
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 The Apache Software Foundation.
+ * Copyright 2001-2013 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.
@@ -15,9 +15,7 @@
*
*/
using System;
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Text;
namespace org.apache.juddi.v3.client.log
{
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs Fri Aug 23 19:52:45 2013
@@ -1,4 +1,20 @@
-using System;
+/*
+ * Copyright 2001-2013 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.
+ *
+ */
+using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -6,6 +22,10 @@ using System.Text;
namespace org.apache.juddi.v3.client.log
{
+ /// <summary>
+ /// A simple file logger
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class FileLogger : Log
{
private string name;
@@ -48,25 +68,25 @@ namespace org.apache.juddi.v3.client.log
public void warn(string msg, Exception ex)
{
if (level.CompareTo(LogLevel.WARN) <= 0)
- WriteEntry(DateTime.Now.ToString("o") + " WARN [" + name + "] " + msg + " " + LogHelper.HandleException(ex), EventLogEntryType.Warning);
+ WriteEntry(DateTime.Now.ToString("o") + " WARN [" + name + "] " + msg + " " + LogHelper.HandleException(ex));
}
public void warn(string msg)
{
if (level.CompareTo(LogLevel.WARN) <= 0)
- WriteEntry(DateTime.Now.ToString("o") + " WARN [" + name + "] " + msg, EventLogEntryType.Warning);
+ WriteEntry(DateTime.Now.ToString("o") + " WARN [" + name + "] " + msg);
}
public void error(string msg, Exception ex)
{
if (level.CompareTo(LogLevel.ERROR) <= 0)
- WriteEntry(DateTime.Now.ToString("o") + " ERROR [" + name + "] " + msg + " " + LogHelper.HandleException(ex), EventLogEntryType.Error);
+ WriteEntry(DateTime.Now.ToString("o") + " ERROR [" + name + "] " + msg + " " + LogHelper.HandleException(ex));
}
public void error(string msg)
{
if (level.CompareTo(LogLevel.ERROR) <= 0)
- WriteEntry(DateTime.Now.ToString("o") + " ERROR [" + name + "] " + msg, EventLogEntryType.Error);
+ WriteEntry(DateTime.Now.ToString("o") + " ERROR [" + name + "] " + msg);
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/Log.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/Log.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/Log.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/Log.cs Fri Aug 23 19:52:45 2013
@@ -20,6 +20,10 @@ using System.Text;
namespace org.apache.juddi.v3.client.log
{
+ /// <summary>
+ /// a simple interface which mimics the log4j API
+ /// </summary>
+ /// @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
public interface Log
{
void info(string msg, Exception ex);
@@ -34,6 +38,11 @@ namespace org.apache.juddi.v3.client.log
void debug(Object msg);
}
+
+ /// <summary>
+ /// Provides some helper functions for Loggers, specifically exception to string handling
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public static class LogHelper
{
public static string HandleException(Exception ex)
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs Fri Aug 23 19:52:45 2013
@@ -23,7 +23,8 @@ using System.Text;
namespace org.apache.juddi.v3.client.log
{
/// <summary>
- ///
+ /// The LogFactor reads from the current configuration (.NET, not the Juddi-Client config xml)
+ /// and produces the appropriate logger
/// </summary>
/// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class LogFactory
@@ -49,7 +50,7 @@ namespace org.apache.juddi.v3.client.log
s = "INFO";
level = (LogLevel)Enum.Parse(typeof(LogLevel), s);
}
- catch (Exception ex)
+ catch
{
level = LogLevel.WARN;
}
@@ -59,7 +60,7 @@ namespace org.apache.juddi.v3.client.log
{
target = System.Configuration.ConfigurationManager.AppSettings["org.apache.juddi.v3.client.log.targets"];
}
- catch (Exception ex)
+ catch
{
level = LogLevel.WARN;
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIConstants.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIConstants.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIConstants.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIConstants.cs Fri Aug 23 19:52:45 2013
@@ -22,8 +22,8 @@ namespace org.apache.juddi.v3.client
{
/// <summary>
/// This file was borrowed from juddi-core's constants file with modifications
- /// @author Alex O'Ree
/// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public static class UDDIConstants
{
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIService.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIService.cs?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIService.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/UDDIService.cs Fri Aug 23 19:52:45 2013
@@ -20,6 +20,10 @@ using System.Text;
using org.uddi.apiv3;
namespace juddi_dotnet
{
+ /// <summary>
+ /// Mirrored from the Java Juddi-client
+ /// </summary>
+ /// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
public class UDDIService
{
public static UDDI_Inquiry_SoapBinding getUDDIInquiryPort()
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java Fri Aug 23 19:52:45 2013
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2001-2013 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.v3.client.embed;
public interface EmbeddedRegistry {
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java Fri Aug 23 19:52:45 2013
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2001-2013 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.v3.client.embed;
import java.lang.reflect.Method;
Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java?rev=1517008&r1=1517007&r2=1517008&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/uddi/JAXBContextUtil.java Fri Aug 23 19:52:45 2013
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2001-2013 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.uddi;
import javax.xml.bind.JAXBContext;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org