Author: alexoree
Date: Tue Feb 11 03:13:57 2014
New Revision: 1566976
URL: http://svn.apache.org/r1566976
Log:
JUDDI-832 done
Added:
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Inquiry.cs
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Publish.cs
Removed:
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2.cs
Modified:
juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/Program.cs
juddi/trunk/juddi-client.net/juddi-client.net-sample/uddi.xml
juddi/trunk/juddi-client.net/juddi-client.net/bindings/UDDIv2_Service.cs
juddi/trunk/juddi-client.net/juddi-client.net/bindings/datamodel.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/MapUDDIv3to2.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Inquiry3to2.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Publish3to2.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Security3to2.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetv2TranslationTransport.cs
Modified:
juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj
Tue Feb 11 03:13:57 2014
@@ -42,7 +42,8 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="org.apache.juddi.client.samples\AccessUDDIv2.cs" />
+ <Compile Include="org.apache.juddi.client.samples\AccessUDDIv2Inquiry.cs"
/>
+ <Compile Include="org.apache.juddi.client.samples\AccessUDDIv2Publish.cs"
/>
<Compile
Include="org.apache.juddi.client.samples\DigitalSignaturesExample.cs" />
<Compile Include="org.apache.juddi.client.samples\Encryption.cs" />
<Compile Include="org.apache.juddi.client.samples\findendpoints.cs" />
Added:
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Inquiry.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Inquiry.cs?rev=1566976&view=auto
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Inquiry.cs
(added)
+++
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Inquiry.cs
Tue Feb 11 03:13:57 2014
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2001-2008 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 org.apache.juddi.v3.client;
+using org.apache.juddi.v3.client.config;
+using org.apache.juddi.v3.client.transport;
+using org.uddi.apiv3;
+using System;
+
+namespace org.apache.juddi.client.samples
+{
+ class AccessUDDIv2Inquiry
+ {
+ internal static void Run(string[] args)
+ {
+
+ UDDIClient clerkManager = null;
+ Transport transport = null;
+ UDDIClerk clerk = null;
+ try
+ {
+ clerkManager = new UDDIClient("uddi.xml");
+
+ transport = clerkManager.getTransport("uddiv2");
+
+ UDDI_Security_SoapBinding security =
transport.getUDDISecurityService();
+ UDDI_Inquiry_SoapBinding inquiry =
transport.getUDDIInquiryService();
+ UDDI_Publication_SoapBinding publish =
transport.getUDDIPublishService();
+
+ clerk = clerkManager.getClerk("uddiv2");
+
+
+ find_business fb = new find_business();
+ //fb.authInfo = clerk.getAuthToken(security.Url);
+ fb.findQualifiers = new string[] {
UDDIConstants.APPROXIMATE_MATCH };
+ fb.name = new name[1];
+ fb.name[0] = new name(UDDIConstants.WILDCARD, "en");
+ businessList bl = inquiry.find_business(fb);
+ for (int i = 0; i < bl.businessInfos.Length; i++)
+ {
+ Console.WriteLine(bl.businessInfos[i].name[0].Value);
+
+ }
+
+ find_service fs = new find_service();
+ fs.findQualifiers = new string[] {
UDDIConstants.APPROXIMATE_MATCH };
+ fs.name = new name[1];
+ fs.name[0] = new name("%", null);
+ serviceList sl=inquiry.find_service(fs);
+ for (int i = 0; i < sl.serviceInfos.Length; i++)
+ {
+ Console.WriteLine(sl.serviceInfos[i].name[0].Value);
+
+ }
+
+ find_tModel ft = new find_tModel();
+ ft.findQualifiers = new string[] {
UDDIConstants.APPROXIMATE_MATCH };
+ ft.name = new name("%", null);
+ tModelList tl = inquiry.find_tModel(ft);
+ for (int i = 0; i < tl.tModelInfos.Length; i++)
+ {
+ Console.WriteLine(tl.tModelInfos[i].name.Value);
+
+ }
+ // serviceDetail s=
clerk.getServiceDetail("uddi:mydomain.com:zerocoolsvc");
+ // Console.Out.WriteLine(new
PrintUDDI<serviceDetail>().print(s));
+ }
+ catch (Exception ex)
+ {
+ while (ex != null)
+ {
+ System.Console.WriteLine("Error! " + ex.Message);
+ ex = ex.InnerException;
+ }
+ }
+ finally
+ {
+ if (transport != null && transport is IDisposable)
+ {
+ ((IDisposable)transport).Dispose();
+ }
+ if (clerk != null)
+ clerk.Dispose();
+ }
+ }
+ }
+}
Added:
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Publish.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Publish.cs?rev=1566976&view=auto
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Publish.cs
(added)
+++
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2Publish.cs
Tue Feb 11 03:13:57 2014
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2001-2008 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 org.apache.juddi.jaxb;
+using org.apache.juddi.v3.client;
+using org.apache.juddi.v3.client.config;
+using org.apache.juddi.v3.client.transport;
+using org.uddi.apiv3;
+using System;
+
+namespace org.apache.juddi.client.samples
+{
+ class AccessUDDIv2Publish
+ {
+ internal static void Run(string[] args)
+ {
+
+ UDDIClient clerkManager = null;
+ Transport transport = null;
+ UDDIClerk clerk = null;
+ try
+ {
+ clerkManager = new UDDIClient("uddi.xml");
+
+ transport = clerkManager.getTransport("uddiv2");
+
+ UDDI_Security_SoapBinding security =
transport.getUDDISecurityService();
+ UDDI_Inquiry_SoapBinding inquiry =
transport.getUDDIInquiryService();
+ UDDI_Publication_SoapBinding publish =
transport.getUDDIPublishService();
+
+ clerk = clerkManager.getClerk("uddiv2");
+
+ save_business sb = new save_business();
+ get_authToken rq=new get_authToken();
+ rq.cred = "username";
+ rq.userID="username";
+ String token=security.get_authToken(rq).authInfo;
+ System.Console.WriteLine("Got an auth token...");
+ sb.authInfo = token;
+ sb.businessEntity = new businessEntity[1];
+ sb.businessEntity[0] = new businessEntity();
+ sb.businessEntity[0].name = new name[] { new name("test
business from .net via uddi2 translation", "en") };
+ sb.businessEntity[0].description = new description[] { new
description("a description", "en") };
+ businessDetail detail= publish.save_business(sb);
+ System.Console.WriteLine("business saved");
+ PrintUDDI<businessDetail> p = new PrintUDDI<businessDetail>();
+ Console.Out.WriteLine(p.print(detail));
+
+ save_service ss = new save_service();
+ ss.authInfo = token;
+ ss.businessService = new businessService[1];
+ ss.businessService[0] = new businessService();
+ ss.businessService[0].name = new name[] { new name("hello
world", "en") };
+ ss.businessService[0].businessKey =
detail.businessEntity[0].businessKey;
+ serviceDetail sd = publish.save_service(ss);
+ System.Console.WriteLine("service saved");
+ PrintUDDI<serviceDetail> p1 = new PrintUDDI<serviceDetail>();
+ Console.Out.WriteLine(p1.print(sd));
+
+ save_binding sbd = new save_binding();
+ sbd.authInfo = token;
+ sbd.bindingTemplate = new bindingTemplate[1];
+ sbd.bindingTemplate[0] = new bindingTemplate();
+ sbd.bindingTemplate[0].Item = new
accessPoint("http://localhost";, "endPoint");
+ sbd.bindingTemplate[0].serviceKey =
sd.businessService[0].serviceKey;
+ bindingDetail bd = publish.save_binding(sbd);
+ System.Console.WriteLine("binding saved");
+ PrintUDDI<bindingDetail> p2 = new PrintUDDI<bindingDetail>();
+ Console.Out.WriteLine(p2.print(bd));
+
+ save_tModel stm = new save_tModel();
+ stm.authInfo = token;
+ stm.tModel = new tModel[1];
+ stm.tModel[0] = new tModel();
+ stm.tModel[0].name = new name("a uddiv2 tmodel", "en");
+ tModelDetail td = publish.save_tModel(stm);
+ System.Console.WriteLine("tModel saved");
+ PrintUDDI<tModelDetail> p3 = new PrintUDDI<tModelDetail>();
+ Console.Out.WriteLine(p3.print(td));
+
+ }
+ catch (Exception ex)
+ {
+ while (ex != null)
+ {
+ System.Console.WriteLine("Error! " + ex.Message);
+ ex = ex.InnerException;
+ }
+ }
+ finally
+ {
+ if (transport != null && transport is IDisposable)
+ {
+ ((IDisposable)transport).Dispose();
+ }
+ if (clerk != null)
+ clerk.Dispose();
+ }
+ }
+ }
+}
Modified:
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/Program.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/Program.cs?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/Program.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/Program.cs
Tue Feb 11 03:13:57 2014
@@ -36,7 +36,8 @@ namespace org.apache.juddi.client.sample
Console.Out.WriteLine("8) jUDDI specific - Save Clerk");
Console.Out.WriteLine("9) Subscription callbacks");
Console.Out.WriteLine("10) Digital Signatures");
- Console.Out.WriteLine("11) Access UDDIv2 using UDDIv3 APIs");
+ Console.Out.WriteLine("11) Access UDDIv2 using UDDIv3 APIs
Inquiry");
+ Console.Out.WriteLine("12) Access UDDIv2 using UDDIv3 APIs
Publish");
Console.Out.Write("Enter selection> ");
String selection = Console.In.ReadLine();
selection = selection.Trim();
@@ -61,7 +62,9 @@ namespace org.apache.juddi.client.sample
else if (selection.Equals("10"))
DigitalSignaturesExample.Run(args);
else if (selection.Equals("11"))
- AccessUDDIv2.Run(args);
+ AccessUDDIv2Inquiry.Run(args);
+ else if (selection.Equals("12"))
+ AccessUDDIv2Publish.Run(args);
Console.WriteLine("Press any key to exit");
Console.Read();
Modified: juddi/trunk/juddi-client.net/juddi-client.net-sample/uddi.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/uddi.xml?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-sample/uddi.xml (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-sample/uddi.xml Tue Feb 11
03:13:57 2014
@@ -91,14 +91,14 @@
<property
name="basicAuthPasswordCryptoProvider"
value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
</properties>
<proxyTransport>org.apache.juddi.v3.client.transport.AspNetv2TranslationTransport</proxyTransport>
-
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+ <custodyTransferUrl>not used</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryv2</inquiryUrl>
-
<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+ <inquiryRESTUrl>not used</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publishv2</publishUrl>
-
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
+ <securityUrl>not used</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/bindings/UDDIv2_Service.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/bindings/UDDIv2_Service.cs?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/bindings/UDDIv2_Service.cs
(original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/bindings/UDDIv2_Service.cs
Tue Feb 11 03:13:57 2014
@@ -2299,7 +2299,9 @@ namespace org.uddi.apiv2
}
}
- /// <remarks/>
+ /// <summary>
+ /// accessPoint or hostingRedirector
+ /// </summary>
[System.Xml.Serialization.XmlElementAttribute("accessPoint",
typeof(accessPoint))]
[System.Xml.Serialization.XmlElementAttribute("hostingRedirector",
typeof(hostingRedirector))]
public object Item
Modified: juddi/trunk/juddi-client.net/juddi-client.net/bindings/datamodel.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/bindings/datamodel.cs?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/bindings/datamodel.cs
(original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/bindings/datamodel.cs Tue Feb
11 03:13:57 2014
@@ -2309,7 +2309,9 @@ namespace org.uddi.apiv3
this.useTypeField = "";
}
- /// <remarks/>
+ /// <summary>
+ /// endPoint, wsdlDeployment, bindingTemplate, hostingRedirector or
something else
+ /// </summary>
[System.Xml.Serialization.XmlAttributeAttribute()]
[System.ComponentModel.DefaultValueAttribute("")]
public string useType
@@ -2454,7 +2456,6 @@ namespace org.uddi.apiv3
/// <summary>
/// overviewDoc
/// </summary>
-
[System.Xml.Serialization.XmlElementAttribute("overviewDoc",
typeof(overviewDoc))]
public overviewDoc[] Items
{
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/MapUDDIv3to2.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/MapUDDIv3to2.cs?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/MapUDDIv3to2.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/MapUDDIv3to2.cs
Tue Feb 11 03:13:57 2014
@@ -263,20 +263,20 @@ namespace org.apache.juddi.v3.client.map
uddi.apiv2.get_assertionStatusReport r = new
uddi.apiv2.get_assertionStatusReport();
r.authInfo = get_assertionStatusReport1.authInfo;
r.generic = VERSION;
- if (get_assertionStatusReport1.completionStatus!=null);
+ if (get_assertionStatusReport1.completionStatus != null) ;
switch (get_assertionStatusReport1.completionStatus)
{
case uddi.apiv3.completionStatus.statusboth_incomplete:
- r.completionStatus=(null);
+ r.completionStatus = (null);
break;
case uddi.apiv3.completionStatus.statuscomplete:
- r.completionStatus=("status:complete");
+ r.completionStatus = ("status:complete");
break;
case uddi.apiv3.completionStatus.statusfromKey_incomplete:
- r.completionStatus=("status:fromKey_incomplete");
+ r.completionStatus = ("status:fromKey_incomplete");
break;
case uddi.apiv3.completionStatus.statustoKey_incomplete:
- r.completionStatus=("status:toKey_incomplete");
+ r.completionStatus = ("status:toKey_incomplete");
break;
}
@@ -394,5 +394,306 @@ namespace org.apache.juddi.v3.client.map
r.authInfo = get_registeredInfo1.authInfo;
return r;
}
+
+ public static uddi.apiv2.save_binding
MapSaveBinding(uddi.apiv3.save_binding save_binding1)
+ {
+ if (save_binding1 == null) return null;
+ uddi.apiv2.save_binding r = new uddi.apiv2.save_binding();
+ r.authInfo = save_binding1.authInfo;
+ r.generic = VERSION;
+ r.bindingTemplate =
MapBindingTemplates(save_binding1.bindingTemplate);
+ return r;
+ }
+
+ private static uddi.apiv2.bindingTemplate[]
MapBindingTemplates(uddi.apiv3.bindingTemplate[] bindingTemplate)
+ {
+ if (bindingTemplate == null) return null;
+ List<uddi.apiv2.bindingTemplate> r = new
List<uddi.apiv2.bindingTemplate>();
+ for (int i = 0; i < bindingTemplate.Length; i++)
+ {
+ uddi.apiv2.bindingTemplate x = new
uddi.apiv2.bindingTemplate();
+ x.bindingKey = bindingTemplate[i].bindingKey;
+ if (x.bindingKey == null)
+ x.bindingKey = "";
+ x.description = MapDescription(bindingTemplate[i].description);
+ x.Item = MapAccessPointHostRedir(bindingTemplate[i].Item);
+ x.serviceKey = bindingTemplate[i].serviceKey;
+ x.tModelInstanceDetails =
MapTModelInstanceDetails(bindingTemplate[i].tModelInstanceDetails);
+ if (x.tModelInstanceDetails == null)
+ x.tModelInstanceDetails = new
uddi.apiv2.tModelInstanceInfo[0];
+ r.Add(x);
+ }
+
+ return r.ToArray();
+ }
+
+ private static object MapAccessPointHostRedir(object p)
+ {
+ if (p is uddi.apiv3.accessPoint)
+ {
+ uddi.apiv3.accessPoint ap = p as uddi.apiv3.accessPoint;
+ uddi.apiv2.accessPoint r = new uddi.apiv2.accessPoint();
+ r.Value = ap.Value;
+ if (ap.useType != null)
+ {
+ if (ap.useType.StartsWith("http:",
StringComparison.CurrentCultureIgnoreCase))
+ r.URLType = uddi.apiv2.URLType.http;
+ else if (ap.useType.StartsWith("https:",
StringComparison.CurrentCultureIgnoreCase))
+ r.URLType = uddi.apiv2.URLType.https;
+ else if (ap.useType.StartsWith("ftp:",
StringComparison.CurrentCultureIgnoreCase))
+ r.URLType = uddi.apiv2.URLType.ftp;
+ else if (ap.useType.StartsWith("mailto:";,
StringComparison.CurrentCultureIgnoreCase))
+ r.URLType = uddi.apiv2.URLType.mailto;
+ else if (ap.useType.StartsWith("fax:",
StringComparison.CurrentCultureIgnoreCase))
+ r.URLType = uddi.apiv2.URLType.fax;
+ else if (ap.useType.StartsWith("phone:",
StringComparison.CurrentCultureIgnoreCase))
+ r.URLType = uddi.apiv2.URLType.phone;
+ else r.URLType = uddi.apiv2.URLType.other;
+ }
+ return r;
+ }
+ if (p is uddi.apiv3.hostingRedirector)
+ {
+ uddi.apiv3.hostingRedirector ap = p as
uddi.apiv3.hostingRedirector;
+ uddi.apiv2.hostingRedirector r = new
uddi.apiv2.hostingRedirector();
+ r.bindingKey = ap.bindingKey;
+ return r;
+ }
+ return null;
+ }
+
+ private static uddi.apiv2.tModelInstanceInfo[]
MapTModelInstanceDetails(uddi.apiv3.tModelInstanceInfo[] tModelInstanceInfo)
+ {
+ if (tModelInstanceInfo == null) return null;
+ List<uddi.apiv2.tModelInstanceInfo> r = new
List<uddi.apiv2.tModelInstanceInfo>();
+ for (int i = 0; i < tModelInstanceInfo.Length; i++)
+ {
+ uddi.apiv2.tModelInstanceInfo x = new
uddi.apiv2.tModelInstanceInfo();
+ x.description =
MapDescription(tModelInstanceInfo[i].description);
+ x.instanceDetails =
MapInstanceDetails(tModelInstanceInfo[i].instanceDetails);
+ x.tModelKey = tModelInstanceInfo[i].tModelKey;
+ r.Add(x);
+ }
+
+ return r.ToArray();
+ }
+
+ private static uddi.apiv2.instanceDetails
MapInstanceDetails(uddi.apiv3.instanceDetails instanceDetails)
+ {
+ if (instanceDetails == null) return null;
+ uddi.apiv2.instanceDetails r = new uddi.apiv2.instanceDetails();
+ r.description = MapDescription(instanceDetails.description);
+ r.instanceParms = instanceDetails.instanceParms;
+ r.overviewDoc = MapOverviewDoc(instanceDetails.Items);
+ return r;
+ }
+
+ private static uddi.apiv2.overviewDoc
MapOverviewDoc(uddi.apiv3.overviewDoc[] overviewDoc)
+ {
+ if (overviewDoc == null || overviewDoc.Length == 0) return null;
+ uddi.apiv2.overviewDoc r = new uddi.apiv2.overviewDoc();
+ r.description = MapDescription(overviewDoc[0].descriptions);
+ if (overviewDoc[0].overviewURLs != null &&
+ overviewDoc[0].overviewURLs.Length > 0)
+ r.overviewURL = overviewDoc[0].overviewURLs[0].Value;
+ return r;
+ }
+
+ private static uddi.apiv2.description[]
MapDescription(uddi.apiv3.description[] description)
+ {
+ if (description == null) return null;
+ List<uddi.apiv2.description> r = new
List<uddi.apiv2.description>();
+ for (int i = 0; i < description.Length; i++)
+ {
+ uddi.apiv2.description x = new uddi.apiv2.description();
+ x.lang = description[i].lang;
+ x.Value = description[i].Value;
+ r.Add(x);
+ }
+ return r.ToArray();
+ }
+
+ public static uddi.apiv2.save_service
MapSaveService(uddi.apiv3.save_service save_service1)
+ {
+ if (save_service1 == null) return null;
+ uddi.apiv2.save_service r = new uddi.apiv2.save_service();
+ r.authInfo = save_service1.authInfo;
+ r.generic = VERSION;
+ r.businessService = MapServices(save_service1.businessService);
+ return r;
+ }
+
+ private static uddi.apiv2.businessService[]
MapServices(uddi.apiv3.businessService[] businessService)
+ {
+ if (businessService == null)
+ return null;
+ List<uddi.apiv2.businessService> r = new
List<uddi.apiv2.businessService>();
+ for (int i = 0; i < businessService.Length; i++)
+ {
+ uddi.apiv2.businessService x = new
uddi.apiv2.businessService();
+ x.bindingTemplates =
MapBindingTemplates(businessService[i].bindingTemplates);
+ x.businessKey = businessService[i].businessKey;
+ x.categoryBag = MapCategoryBag(businessService[i].categoryBag);
+ x.description = MapDescription(businessService[i].description);
+ x.name = MapName(businessService[i].name);
+ x.serviceKey = businessService[i].serviceKey;
+ if (x.serviceKey == null)
+ x.serviceKey = "";
+ r.Add(x);
+ }
+ return r.ToArray();
+ }
+
+ public static uddi.apiv2.save_business
MapSaveBusiness(uddi.apiv3.save_business save_business1)
+ {
+ if (save_business1 == null) return null;
+ uddi.apiv2.save_business r = new uddi.apiv2.save_business();
+ r.authInfo = save_business1.authInfo;
+ r.generic = VERSION;
+ r.businessEntity = MapBusinesss(save_business1.businessEntity);
+ return r;
+ }
+
+ private static uddi.apiv2.businessEntity[]
MapBusinesss(uddi.apiv3.businessEntity[] businessEntity)
+ {
+ if (businessEntity == null) return null;
+ List<uddi.apiv2.businessEntity> r = new
List<uddi.apiv2.businessEntity>();
+ for (int i = 0; i < businessEntity.Length; i++)
+ {
+ uddi.apiv2.businessEntity x = new uddi.apiv2.businessEntity();
+ x.businessKey = businessEntity[i].businessKey;
+ if (x.businessKey == null)
+ x.businessKey = "";
+ x.businessServices =
MapServices(businessEntity[i].businessServices);
+ x.categoryBag = MapCategoryBag(businessEntity[i].categoryBag);
+ x.contacts = MapContacts(businessEntity[i].contacts);
+ x.description = MapDescription(businessEntity[i].description);
+ x.discoveryURLs = MapDiscoURL(businessEntity[i].discoveryURLs);
+ x.identifierBag = MapIdentBag(businessEntity[i].identifierBag);
+ x.name = MapName(businessEntity[i].name);
+
+ r.Add(x);
+ }
+ return r.ToArray();
+ }
+
+ private static uddi.apiv2.contact[] MapContacts(uddi.apiv3.contact[]
contact)
+ {
+ if (contact == null) return null;
+ List<uddi.apiv2.contact> r = new List<uddi.apiv2.contact>();
+ for (int i = 0; i < contact.Length; i++)
+ {
+ uddi.apiv2.contact x = new uddi.apiv2.contact();
+ x.address = MapAddress(contact[i].address);
+ x.description = MapDescription(contact[i].description);
+ x.email = MapEmail(contact[i].email);
+ if (contact[i].personName != null &&
contact[i].personName.Length > 0)
+ x.personName = contact[i].personName[0].Value;
+ x.phone = MapPhone(contact[i].phone);
+ x.useType = contact[i].useType;
+ r.Add(x);
+ }
+ return r.ToArray();
+ }
+
+ private static uddi.apiv2.phone[] MapPhone(uddi.apiv3.phone[] phone)
+ {
+ if (phone == null) return null;
+ List<uddi.apiv2.phone> r = new List<uddi.apiv2.phone>();
+ for (int i = 0; i < phone.Length; i++)
+ {
+ uddi.apiv2.phone x = new uddi.apiv2.phone();
+ x.useType = phone[i].useType;
+ x.Value = phone[i].Value;
+ r.Add(x);
+ }
+ return r.ToArray();
+ }
+
+ private static uddi.apiv2.email[] MapEmail(uddi.apiv3.email[] email)
+ {
+ if (email == null) return null;
+ List<uddi.apiv2.email> r = new List<uddi.apiv2.email>();
+ for (int i = 0; i < email.Length; i++)
+ {
+ uddi.apiv2.email x = new uddi.apiv2.email();
+ x.useType = email[i].useType;
+ x.Value = email[i].Value;
+ r.Add(x);
+ }
+ return r.ToArray();
+ }
+
+ private static uddi.apiv2.address[] MapAddress(uddi.apiv3.address[]
address)
+ {
+ if (address == null) return null;
+ List<uddi.apiv2.address> r = new List<uddi.apiv2.address>();
+ for (int i = 0; i < address.Length; i++)
+ {
+ uddi.apiv2.address x = new uddi.apiv2.address();
+ x.useType = address[i].useType;
+ x.sortCode = address[i].sortCode;
+ x.tModelKey = address[i].tModelKey;
+ x.addressLine = MapAddressLine(address[i].addressLine);
+ r.Add(x);
+ }
+ return r.ToArray();
+ }
+
+ private static uddi.apiv2.addressLine[]
MapAddressLine(uddi.apiv3.addressLine[] addressLine)
+ {
+ if (addressLine == null) return null;
+ List<uddi.apiv2.addressLine> r = new
List<uddi.apiv2.addressLine>();
+ for (int i = 0; i < addressLine.Length; i++)
+ {
+ uddi.apiv2.addressLine x = new uddi.apiv2.addressLine();
+ x.keyName = addressLine[i].keyName;
+ x.keyValue= addressLine[i].keyValue;
+ x.Value= addressLine[i].Value;
+ r.Add(x);
+ }
+ return r.ToArray();
+ }
+
+ public static uddi.apiv2.save_tModel
MapSaveTModel(uddi.apiv3.save_tModel save_tModel1)
+ {
+ if (save_tModel1 == null) return null;
+ uddi.apiv2.save_tModel r = new uddi.apiv2.save_tModel();
+ r.authInfo = save_tModel1.authInfo;
+ r.tModel = MapTModels(save_tModel1.tModel);
+ r.generic = VERSION;
+ return r;
+ }
+
+ private static uddi.apiv2.tModel[] MapTModels(uddi.apiv3.tModel[]
tModel)
+ {
+ if (tModel == null) return null;
+ List<uddi.apiv2.tModel> r = new List<uddi.apiv2.tModel>();
+ for (int i = 0; i < tModel.Length; i++)
+ {
+ uddi.apiv2.tModel x = new uddi.apiv2.tModel();
+ x.categoryBag = MapCategoryBag(tModel[i].categoryBag);
+ x.description =MapDescription( tModel[i].description);
+ x.identifierBag = MapIdentBag(tModel[i].identifierBag);
+ x.name = MapName(new org.uddi.apiv3.name[]{tModel[i].name})[0];
+ x.overviewDoc = MapOverviewDoc(tModel[i].overviewDoc);
+ x.tModelKey = tModel[i].tModelKey;
+ if (x.tModelKey == null)
+ x.tModelKey = "";
+ r.Add(x);
+ }
+ return r.ToArray();
+ }
+
+ public static uddi.apiv2.set_publisherAssertions
MapSetPublisherAssertions(uddi.apiv3.set_publisherAssertions
set_publisherAssertions1)
+ {
+ if (set_publisherAssertions1 == null) return null;
+ uddi.apiv2.set_publisherAssertions r = new
uddi.apiv2.set_publisherAssertions();
+ r.authInfo = set_publisherAssertions1.authInfo;
+ r.generic = VERSION;
+ r.publisherAssertion =
MapPublisherAssertions(set_publisherAssertions1.publisherAssertion);
+
+ return r;
+ }
}
}
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Inquiry3to2.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Inquiry3to2.cs?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Inquiry3to2.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Inquiry3to2.cs
Tue Feb 11 03:13:57 2014
@@ -15,7 +15,7 @@ namespace org.apache.juddi.v3.client.tra
/// @author <a href="[email protected]">Alex O'Ree</a>
/// @since 3.2.1
/// </summary>
- public class Inquiry3to2 : UDDI_Inquiry_SoapBinding
+ public class Inquiry3to2 : UDDI_Inquiry_SoapBinding, IDisposable
{
private InquireSoap inquiry = new InquireSoap();
@@ -30,6 +30,15 @@ namespace org.apache.juddi.v3.client.tra
}
+ public void Dispose()
+ {
+ if (inquiry != null)
+ {
+ inquiry.Dispose();
+ inquiry = null;
+ }
+ }
+
private void Init()
{
inquiry.Url = this.Url;
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Publish3to2.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Publish3to2.cs?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Publish3to2.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Publish3to2.cs
Tue Feb 11 03:13:57 2014
@@ -8,7 +8,7 @@ using System.Text;
namespace org.apache.juddi.v3.client.transport.wrapper
{
- public class Publish3to2 : UDDI_Publication_SoapBinding
+ public class Publish3to2 : UDDI_Publication_SoapBinding, IDisposable
{
public static readonly String VERSION = "2.0";
private string endpointURL;
@@ -23,6 +23,11 @@ namespace org.apache.juddi.v3.client.tra
{
// TODO: Complete member initialization
}
+ protected void Dispose()
+ {
+ base.Dispose();
+ publish.Dispose();
+ }
private void Init()
{
publish.Url = this.Url;
@@ -67,5 +72,31 @@ namespace org.apache.juddi.v3.client.tra
return
MapUDDIv2to3.MapPublisherAssertions(publish.get_publisherAssertions(MapUDDIv3to2.MapGetPublisherAssertions(get_publisherAssertions1)));
}
+ public override uddi.apiv3.bindingDetail
save_binding(uddi.apiv3.save_binding save_binding1)
+ {
+ Init();
+ return
MapUDDIv2to3.MapBindingDetail(publish.save_binding(MapUDDIv3to2.MapSaveBinding(save_binding1)));
+ }
+ public override uddi.apiv3.serviceDetail
save_service(uddi.apiv3.save_service save_service1)
+ {
+ Init();
+ return
MapUDDIv2to3.MapServiceDetail(publish.save_service(MapUDDIv3to2.MapSaveService(save_service1)));
+ }
+ public override uddi.apiv3.businessDetail
save_business(uddi.apiv3.save_business save_business1)
+ {
+ Init();
+ return
MapUDDIv2to3.MapBusinessDetail(publish.save_business(MapUDDIv3to2.MapSaveBusiness(save_business1)));
+ }
+ public override uddi.apiv3.tModelDetail
save_tModel(uddi.apiv3.save_tModel save_tModel1)
+ {
+ Init();
+ return
MapUDDIv2to3.MapTModelDetail(publish.save_tModel(MapUDDIv3to2.MapSaveTModel(save_tModel1)));
+ }
+ public override uddi.apiv3.publisherAssertion[]
set_publisherAssertions(uddi.apiv3.set_publisherAssertions
set_publisherAssertions1)
+ {
+ Init();
+ return
MapUDDIv2to3.MapPublisherAssertions(publish.set_publisherAssertions(MapUDDIv3to2.MapSetPublisherAssertions(set_publisherAssertions1)));
+ }
+
}
}
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Security3to2.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Security3to2.cs?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Security3to2.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport.wrapper/Security3to2.cs
Tue Feb 11 03:13:57 2014
@@ -7,10 +7,10 @@ using System.Text;
namespace org.apache.juddi.v3.client.transport.wrapper
{
- public class Security3to2 : UDDI_Security_SoapBinding
+ public class Security3to2 : UDDI_Security_SoapBinding, IDisposable
{
private string endpointURL;
- private PublishSoap publish = new PublishSoap();
+ private PublishSoap publishv2 = new PublishSoap();
public Security3to2(string endpointURL)
{
@@ -22,9 +22,18 @@ namespace org.apache.juddi.v3.client.tra
{
// TODO: Complete member initialization
}
+ public void Dispose()
+ {
+ base.Dispose();
+ if (publishv2 != null)
+ {
+ publishv2.Dispose();
+ publishv2 = null;
+ }
+ }
private void Init()
{
- publish.Url = this.Url;
+ publishv2.Url = this.Url;
}
public override void discard_authToken(uddi.apiv3.discard_authToken
discard_authToken1)
@@ -33,7 +42,7 @@ namespace org.apache.juddi.v3.client.tra
uddi.apiv2.discard_authToken r = new
uddi.apiv2.discard_authToken();
r.authInfo = discard_authToken1.authInfo;
r.generic = VERSION;
- publish.discard_authToken(r);
+ publishv2.discard_authToken(r);
}
public override uddi.apiv3.authToken
get_authToken(uddi.apiv3.get_authToken get_authToken1)
{
@@ -42,7 +51,7 @@ namespace org.apache.juddi.v3.client.tra
r.cred = get_authToken1.cred;
r.generic = VERSION;
r.userID = get_authToken1.userID;
- uddi.apiv2.authToken res = publish.get_authToken(r);
+ uddi.apiv2.authToken res = publishv2.get_authToken(r);
uddi.apiv3.authToken x = new uddi.apiv3.authToken();
x.authInfo = res.authInfo;
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetv2TranslationTransport.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetv2TranslationTransport.cs?rev=1566976&r1=1566975&r2=1566976&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetv2TranslationTransport.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetv2TranslationTransport.cs
Tue Feb 11 03:13:57 2014
@@ -7,7 +7,7 @@ using System.Text;
namespace org.apache.juddi.v3.client.transport
{
- public class AspNetv2TranslationTransport : AspNetTransport
+ public class AspNetv2TranslationTransport : AspNetTransport, IDisposable
{
String nodeName = null;
@@ -29,17 +29,27 @@ namespace org.apache.juddi.v3.client.tra
this.inquiryService.Url =
clientConfig.getUDDINode(nodeName).getInquiryUrl();
this.publisherService.Url =
clientConfig.getUDDINode(nodeName).getJuddiApiUrl();
this.publishService.Url =
clientConfig.getUDDINode(nodeName).getPublishUrl();
- this.securityService.Url =
clientConfig.getUDDINode(nodeName).getSecurityUrl();
+ this.securityService.Url =
clientConfig.getUDDINode(nodeName).getPublishUrl();
}
public override uddi.apiv3.UDDI_Inquiry_SoapBinding
getUDDIInquiryService()
{
return inquiryService;
}
+ /// <summary>
+ /// callers must call .Dispose of returned objects
+ /// </summary>
+ /// <param name="endpointURL"></param>
+ /// <returns></returns>
public override uddi.apiv3.UDDI_Inquiry_SoapBinding
getUDDIInquiryService(string endpointURL)
{
return new Inquiry3to2(endpointURL);
}
+ /// <summary>
+ /// callers must call .Dispose of returned objects
+ /// </summary>
+ /// <param name="endpointURL"></param>
+ /// <returns></returns>
public override uddi.apiv3.UDDI_Publication_SoapBinding
getUDDIPublishService(string endpointURL)
{
return new Publish3to2(endpointURL);
@@ -52,11 +62,24 @@ namespace org.apache.juddi.v3.client.tra
{
return this.securityService;
}
-
+ /// <summary>
+ /// callers must call .Dispose of returned objects
+ /// </summary>
+ /// <param name="endpointURL"></param>
+ /// <returns></returns>
public override uddi.apiv3.UDDI_Security_SoapBinding
getUDDISecurityService(string endpointURL)
{
return new Security3to2(endpointURL);
}
+ public void Dispose()
+ {
+ inquiryService.Dispose();
+ publishService.Dispose();
+ publisherService.Dispose();
+ securityService.Dispose();
+ base.Dispose();
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
