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 2014/01/10 03:52:46 UTC
svn commit: r1557015 - in /juddi/trunk: juddi-client.net/
juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/
juddi-client.net/juddi-client.net.test/org.apache.juddi.client.test/
juddi-client.net/juddi-client.net.test/resour...
Author: alexoree
Date: Fri Jan 10 02:52:45 2014
New Revision: 1557015
URL: http://svn.apache.org/r1557015
Log:
JUDDI-776 fixed for .net, tests added
JUDDI-714 updating documentation
Added:
juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample_1.wsdl
Modified:
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WadlImport.cs
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WsdlImport.cs
juddi/trunk/juddi-client.net/juddi-client.net.test/org.apache.juddi.client.test/WSDL2UDDITest.cs
juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WSDL2UDDI.cs
juddi/trunk/juddi-client.net/readme.txt
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/Common2UDDI.java
Modified: juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WadlImport.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WadlImport.cs?rev=1557015&r1=1557014&r2=1557015&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WadlImport.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WadlImport.cs Fri Jan 10 02:52:45 2014
@@ -50,7 +50,7 @@ namespace org.apache.juddi.client.sample
//Wadl Import example
- application app = WADL2UDDI.ParseWadl("sample.wadl");
+ application app = WADL2UDDI.ParseWadl("..\\..\\..\\juddi-client.net.test\\resources\\sample.wadl");
List<Uri> urls = WADL2UDDI.GetBaseAddresses(app);
Uri url = urls[0];
String domain = url.Host;
Modified: juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WsdlImport.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WsdlImport.cs?rev=1557015&r1=1557014&r2=1557015&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WsdlImport.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples.juddi/WsdlImport.cs Fri Jan 10 02:52:45 2014
@@ -30,18 +30,27 @@ namespace org.apache.juddi.client.sample
{
Console.Out.Write("Enter WSDL url: >");
String input = Console.In.ReadLine();
- if (String.IsNullOrEmpty("input"))
+ if (String.IsNullOrEmpty(input))
input = "http://wsf.cdyne.com/WeatherWS/Weather.asmx?WSDL";
//String wsdlURL = "http://wsf.cdyne.com/WeatherWS/Weather.asmx?WSDL";
- Uri url = new Uri(input);
-
+ //if (String.IsNullOrEmpty(input))
+ Uri url = null;
+ String host = "localhost";
+ int port = 80;
+ try
+ {
+ url = new Uri(input);
+ host = url.Host;
+ port = url.Port;
+ }
+ catch { }
ReadWSDL wsi = new ReadWSDL();
tDefinitions wsdlDefinition = wsi.readWSDL(input);
Properties properties1 = new Properties();
- properties1.put("serverName", url.Host);
- properties1.put("businessName", url.Host);
- properties1.put("keyDomain", "uddi:" + url.Host);
- int port = url.Port;
+ properties1.put("serverName", host);
+ properties1.put("businessName", host);
+ properties1.put("keyDomain", "uddi:" + host);
+
if (port <= 0)
{
if (url.ToString().StartsWith("https", StringComparison.CurrentCultureIgnoreCase))
@@ -50,7 +59,7 @@ namespace org.apache.juddi.client.sample
}
properties1.put("serverPort", port.ToString());
- tModel keypart = UDDIClerk.createKeyGenator(url.Host, url.Host + "'s key partition", "en");
+ tModel keypart = UDDIClerk.createKeyGenator(host, host + "'s key partition", "en");
WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(null, new URLLocalizer(), properties1);
List<tModel> tModels1 = new List<tModel>();
Modified: juddi/trunk/juddi-client.net/juddi-client.net.test/org.apache.juddi.client.test/WSDL2UDDITest.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/org.apache.juddi.client.test/WSDL2UDDITest.cs?rev=1557015&r1=1557014&r2=1557015&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/org.apache.juddi.client.test/WSDL2UDDITest.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/org.apache.juddi.client.test/WSDL2UDDITest.cs Fri Jan 10 02:52:45 2014
@@ -45,6 +45,13 @@ namespace juddi_client.net.test
runTest(path + Path.DirectorySeparatorChar + "juddi-api-flattened.wsdl");
}
+ [Test]
+ public void juddiapiflattenedTestLongDescriptions()
+ {
+ Assume.That(path != null);
+ runTest(path + Path.DirectorySeparatorChar + "sample_1.wsdl");
+ }
+
[Test]
public void ReadWSDLTest1()
@@ -78,7 +85,7 @@ namespace juddi_client.net.test
{
Assume.That(File.Exists(pathAndFile));
-
+
ReadWSDL wsi = new ReadWSDL();
tDefinitions wsdlDefinition = wsi.readWSDL(
pathAndFile
@@ -110,8 +117,18 @@ namespace juddi_client.net.test
Assert.True(businessServices.Length > 0);
for (int i = 0; i < businessServices.Length; i++)
{
+ foreach (description d in businessServices[i].description)
+ {
+ if (d.lang != null)
+ Assert.True(d.lang.Length <= UDDIConstants.MAX_xml_lang_length);
+ if (d.Value != null)
+ Assert.True(d.Value.Length <= UDDIConstants.MAX_description_length);
+ }
foreach (bindingTemplate bt in businessServices[i].bindingTemplates)
{
+
+
+
Assert.NotNull(bt);
Assert.NotNull(bt.bindingKey);
Assert.NotNull(bt.Item);
@@ -119,6 +136,26 @@ namespace juddi_client.net.test
Assert.True(bt.Item is accessPoint);
Assert.NotNull(((accessPoint)bt.Item).useType);
Assert.NotNull(((accessPoint)bt.Item).Value);
+
+ foreach (description d in bt.description)
+ {
+ if (d.lang != null)
+ Assert.True(d.lang.Length <= UDDIConstants.MAX_xml_lang_length);
+ if (d.Value != null)
+ Assert.True(d.Value.Length <= UDDIConstants.MAX_description_length);
+ }
+
+ foreach (tModelInstanceInfo tm in bt.tModelInstanceDetails)
+ {
+ foreach (description d in tm.description)
+ {
+ if (d.lang != null)
+ Assert.True(d.lang.Length <= UDDIConstants.MAX_xml_lang_length);
+ if (d.Value != null)
+ Assert.True(d.Value.Length <= UDDIConstants.MAX_description_length);
+ }
+ }
+
}
Assert.True(businessServices[i].bindingTemplates.Length > 0);
Assert.NotNull(businessServices[i].description);
Added: juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample_1.wsdl
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample_1.wsdl?rev=1557015&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample_1.wsdl (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample_1.wsdl Fri Jan 10 02:52:45 2014
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="StockQuote" targetNamespace="http://example.com/stockquote/"
+ xmlns:tns="http://example.com/stockquote/" xmlns:xsd1="http://example.com/stockquote/schema/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <documentation>This WSDL defines the Lorem ipsum dolor sit amet, ad vim laudem mediocritatem, in mutat illum electram has. Vim ex aliquid elaboraret, modus alienum cum et. Dicta erroribus at nec. Eos ullum pertinax no, consul maiorum eam cu. Alia munere quaeque duo ne.
+
+Oratio gubergren pri eu. Ei vis ludus soleat virtute. Usu te corpora delicata. Quidam suscipit voluptatum eos at, ei mea augue meliore eloquentiam. Alterum deleniti oporteat sea in, saperet singulis inciderint ius ei, nulla voluptatum nam ea. Vim debitis noluisse referrentur no. Ei pro recteque reprimique, ad usu oratio aperiam volutpat.
+
+Et quando indoctum voluptaria vel, eum falli vocibus qualisque ne, molestiae intellegam et vis. Ea mei admodum mediocrem dissentiunt, cibo nostrud conclusionemque ea eum. Vel nisl mnesarchum no, id simul pertinax has, ut alterum legimus qualisque nam. Id mentitum erroribus vel. Cum in omnes verear iuvaret, pro eros dolor numquam et, adipisci partiendo et ius. Mea vivendo epicuri ex, ad sit mollis quaerendum. Ad est iracundia adversarium, vis et autem nostro, saepe similique an his.
+Lorem ipsum dolor sit amet, ad vim laudem mediocritatem, in mutat illum electram has. Vim ex aliquid elaboraret, modus alienum cum et. Dicta erroribus at nec. Eos ullum pertinax no, consul maiorum eam cu. Alia munere quaeque duo ne.
+
+Oratio gubergren pri eu. Ei vis ludus soleat virtute. Usu te corpora delicata. Quidam suscipit voluptatum eos at, ei mea augue meliore eloquentiam. Alterum deleniti oporteat sea in, saperet singulis inciderint ius ei, nulla voluptatum nam ea. Vim debitis noluisse referrentur no. Ei pro recteque reprimique, ad usu oratio aperiam volutpat.
+
+Et quando indoctum voluptaria vel, eum falli vocibus qualisque ne, molestiae intellegam et vis. Ea mei admodum mediocrem dissentiunt, cibo nostrud conclusionemque ea eum. Vel nisl mnesarchum no, id simul pertinax has, ut alterum legimus qualisque nam. Id mentitum erroribus vel. Cum in omnes verear iuvaret, pro eros dolor numquam et, adipisci partiendo et ius. Mea vivendo epicuri ex, ad sit mollis quaerendum. Ad est iracundia adversarium, vis et autem nostro, saepe similique an his.
+</documentation>
+
+ <types>
+ <schema targetNamespace="http://example.com/stockquote/schema/"
+ xmlns="http://www.w3.org/2001/XMLSchema">
+ <element name="TradePriceRequest">
+ <complexType>
+ <all>
+ <element name="tickerSymbol" type="string" />
+ </all>
+ </complexType>
+ </element>
+ <element name="TradePrice">
+ <complexType>
+ <all>
+ <element name="price" type="float" />
+ </all>
+ </complexType>
+ </element>
+ </schema>
+ </types>
+ <message name="GetLastTradePriceInput">
+ <part name="body" element="xsd1:TradePriceRequest" />
+ </message>
+ <message name="GetLastTradePriceOutput">
+ <part name="body" element="xsd1:TradePrice" />
+ </message>
+ <portType name="StockQuotePortType">
+ <documentation>This PORT defines the Lorem ipsum dolor sit amet, ad vim laudem mediocritatem, in mutat illum electram has. Vim ex aliquid elaboraret, modus alienum cum et. Dicta erroribus at nec. Eos ullum pertinax no, consul maiorum eam cu. Alia munere quaeque duo ne.
+
+Oratio gubergren pri eu. Ei vis ludus soleat virtute. Usu te corpora delicata. Quidam suscipit voluptatum eos at, ei mea augue meliore eloquentiam. Alterum deleniti oporteat sea in, saperet singulis inciderint ius ei, nulla voluptatum nam ea. Vim debitis noluisse referrentur no. Ei pro recteque reprimique, ad usu oratio aperiam volutpat.
+
+Et quando indoctum voluptaria vel, eum falli vocibus qualisque ne, molestiae intellegam et vis. Ea mei admodum mediocrem dissentiunt, cibo nostrud conclusionemque ea eum. Vel nisl mnesarchum no, id simul pertinax has, ut alterum legimus qualisque nam. Id mentitum erroribus vel. Cum in omnes verear iuvaret, pro eros dolor numquam et, adipisci partiendo et ius. Mea vivendo epicuri ex, ad sit mollis quaerendum. Ad est iracundia adversarium, vis et autem nostro, saepe similique an his.
+Lorem ipsum dolor sit amet, ad vim laudem mediocritatem, in mutat illum electram has. Vim ex aliquid elaboraret, modus alienum cum et. Dicta erroribus at nec. Eos ullum pertinax no, consul maiorum eam cu. Alia munere quaeque duo ne.
+
+Oratio gubergren pri eu. Ei vis ludus soleat virtute. Usu te corpora delicata. Quidam suscipit voluptatum eos at, ei mea augue meliore eloquentiam. Alterum deleniti oporteat sea in, saperet singulis inciderint ius ei, nulla voluptatum nam ea. Vim debitis noluisse referrentur no. Ei pro recteque reprimique, ad usu oratio aperiam volutpat.
+
+Et quando indoctum voluptaria vel, eum falli vocibus qualisque ne, molestiae intellegam et vis. Ea mei admodum mediocrem dissentiunt, cibo nostrud conclusionemque ea eum. Vel nisl mnesarchum no, id simul pertinax has, ut alterum legimus qualisque nam. Id mentitum erroribus vel. Cum in omnes verear iuvaret, pro eros dolor numquam et, adipisci partiendo et ius. Mea vivendo epicuri ex, ad sit mollis quaerendum. Ad est iracundia adversarium, vis et autem nostro, saepe similique an his.
+</documentation>
+ <operation name="GetLastTradePrice">
+
+ <input message="tns:GetLastTradePriceInput" />
+ <output message="tns:GetLastTradePriceOutput" />
+ </operation>
+ </portType>
+ <binding name="StockQuoteSoapBinding" type="tns:StockQuotePortType">
+ <documentation>This BINDING defines the Lorem ipsum dolor sit amet, ad vim laudem mediocritatem, in mutat illum electram has. Vim ex aliquid elaboraret, modus alienum cum et. Dicta erroribus at nec. Eos ullum pertinax no, consul maiorum eam cu. Alia munere quaeque duo ne.
+
+Oratio gubergren pri eu. Ei vis ludus soleat virtute. Usu te corpora delicata. Quidam suscipit voluptatum eos at, ei mea augue meliore eloquentiam. Alterum deleniti oporteat sea in, saperet singulis inciderint ius ei, nulla voluptatum nam ea. Vim debitis noluisse referrentur no. Ei pro recteque reprimique, ad usu oratio aperiam volutpat.
+
+Et quando indoctum voluptaria vel, eum falli vocibus qualisque ne, molestiae intellegam et vis. Ea mei admodum mediocrem dissentiunt, cibo nostrud conclusionemque ea eum. Vel nisl mnesarchum no, id simul pertinax has, ut alterum legimus qualisque nam. Id mentitum erroribus vel. Cum in omnes verear iuvaret, pro eros dolor numquam et, adipisci partiendo et ius. Mea vivendo epicuri ex, ad sit mollis quaerendum. Ad est iracundia adversarium, vis et autem nostro, saepe similique an his.
+Lorem ipsum dolor sit amet, ad vim laudem mediocritatem, in mutat illum electram has. Vim ex aliquid elaboraret, modus alienum cum et. Dicta erroribus at nec. Eos ullum pertinax no, consul maiorum eam cu. Alia munere quaeque duo ne.
+
+Oratio gubergren pri eu. Ei vis ludus soleat virtute. Usu te corpora delicata. Quidam suscipit voluptatum eos at, ei mea augue meliore eloquentiam. Alterum deleniti oporteat sea in, saperet singulis inciderint ius ei, nulla voluptatum nam ea. Vim debitis noluisse referrentur no. Ei pro recteque reprimique, ad usu oratio aperiam volutpat.
+
+Et quando indoctum voluptaria vel, eum falli vocibus qualisque ne, molestiae intellegam et vis. Ea mei admodum mediocrem dissentiunt, cibo nostrud conclusionemque ea eum. Vel nisl mnesarchum no, id simul pertinax has, ut alterum legimus qualisque nam. Id mentitum erroribus vel. Cum in omnes verear iuvaret, pro eros dolor numquam et, adipisci partiendo et ius. Mea vivendo epicuri ex, ad sit mollis quaerendum. Ad est iracundia adversarium, vis et autem nostro, saepe similique an his.
+</documentation>
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <operation name="GetLastTradePrice">
+ <soap:operation soapAction="http://example.com/GetLastTradePrice" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ </binding>
+ <service name="StockQuoteService">
+ <documentation>This Service doc defines the Lorem ipsum dolor sit amet, ad vim laudem mediocritatem, in mutat illum electram has. Vim ex aliquid elaboraret, modus alienum cum et. Dicta erroribus at nec. Eos ullum pertinax no, consul maiorum eam cu. Alia munere quaeque duo ne.
+
+Oratio gubergren pri eu. Ei vis ludus soleat virtute. Usu te corpora delicata. Quidam suscipit voluptatum eos at, ei mea augue meliore eloquentiam. Alterum deleniti oporteat sea in, saperet singulis inciderint ius ei, nulla voluptatum nam ea. Vim debitis noluisse referrentur no. Ei pro recteque reprimique, ad usu oratio aperiam volutpat.
+
+Et quando indoctum voluptaria vel, eum falli vocibus qualisque ne, molestiae intellegam et vis. Ea mei admodum mediocrem dissentiunt, cibo nostrud conclusionemque ea eum. Vel nisl mnesarchum no, id simul pertinax has, ut alterum legimus qualisque nam. Id mentitum erroribus vel. Cum in omnes verear iuvaret, pro eros dolor numquam et, adipisci partiendo et ius. Mea vivendo epicuri ex, ad sit mollis quaerendum. Ad est iracundia adversarium, vis et autem nostro, saepe similique an his.
+Lorem ipsum dolor sit amet, ad vim laudem mediocritatem, in mutat illum electram has. Vim ex aliquid elaboraret, modus alienum cum et. Dicta erroribus at nec. Eos ullum pertinax no, consul maiorum eam cu. Alia munere quaeque duo ne.
+
+Oratio gubergren pri eu. Ei vis ludus soleat virtute. Usu te corpora delicata. Quidam suscipit voluptatum eos at, ei mea augue meliore eloquentiam. Alterum deleniti oporteat sea in, saperet singulis inciderint ius ei, nulla voluptatum nam ea. Vim debitis noluisse referrentur no. Ei pro recteque reprimique, ad usu oratio aperiam volutpat.
+
+Et quando indoctum voluptaria vel, eum falli vocibus qualisque ne, molestiae intellegam et vis. Ea mei admodum mediocrem dissentiunt, cibo nostrud conclusionemque ea eum. Vel nisl mnesarchum no, id simul pertinax has, ut alterum legimus qualisque nam. Id mentitum erroribus vel. Cum in omnes verear iuvaret, pro eros dolor numquam et, adipisci partiendo et ius. Mea vivendo epicuri ex, ad sit mollis quaerendum. Ad est iracundia adversarium, vis et autem nostro, saepe similique an his.
+</documentation>
+ <port name="StockQuotePort" binding="tns:StockQuoteSoapBinding">
+ <soap:address location="http://location/sample" />
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Modified: juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj?rev=1557015&r1=1557014&r2=1557015&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj Fri Jan 10 02:52:45 2014
@@ -73,6 +73,7 @@
<Compile Include="org.apache.juddi.v3.client.cryptor\DigSigUtil.cs" />
<Compile Include="org.apache.juddi.v3.client.cryptor\TripleDESCryptor.cs" />
<Compile Include="org.apache.juddi.v3.client.ext.wsdm\WSDMQosConstants.cs" />
+ <Compile Include="org.apache.juddi.v3.client.mapping\Common2UDDI.cs" />
<Compile Include="org.apache.juddi.v3.client.mapping\easyWsdl.cs" />
<Compile Include="org.apache.juddi.v3.client.mapping\ServiceRegistrationResponse.cs" />
<Compile Include="org.apache.juddi.v3.client.mapping\URLLocalizer.cs" />
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs?rev=1557015&r1=1557014&r2=1557015&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs Fri Jan 10 02:52:45 2014
@@ -1,4 +1,5 @@
using net.java.dev.wadl;
+using org.apache.juddi.client.org.apache.juddi.v3.client.mapping;
using org.apache.juddi.v3.client.config;
using org.apache.juddi.v3.client.log;
using org.uddi.apiv3;
@@ -132,60 +133,41 @@ namespace org.apache.juddi.v3.client.map
String serviceDescription = properties.getProperty(Property.SERVICE_DESCRIPTION, Property.DEFAULT_SERVICE_DESCRIPTION);
// Override with the service description from the WSDL if present
bool lengthwarn = false;
+ List<description> ds = new List<description>();
if (wadlDefinition.doc != null)
{
for (int i = 0; i < wadlDefinition.doc.Length; i++)
{
+
+ String locallang = lang;
description description = new description();
if (wadlDefinition.doc[i].lang != null)
{
- description.lang = (wadlDefinition.doc[i].lang);
+ locallang = (wadlDefinition.doc[i].lang);
}
- else
- {
- description.lang = (lang);
- }
- if (description.lang != null && description.lang.Length > UDDIConstants.MAX_xml_lang_length)
+
+
+ if (locallang.Length > UDDIConstants.MAX_xml_lang_length)
{
lengthwarn = true;
- description.lang = (description.lang.Substring(0, UDDIConstants.MAX_xml_lang_length - 1));
+ locallang = (locallang.Substring(0, UDDIConstants.MAX_xml_lang_length - 1));
}
StringBuilder sb = new StringBuilder();
sb.Append(wadlDefinition.doc[i].title).Append(" ");
sb.Append(ContentToString(wadlDefinition.doc[i].Any));
- description.Value = (wadlDefinition.doc[i].title);
- if (description.Value != null && description.Value.Length > UDDIConstants.MAX_description_length)
- {
- lengthwarn = true;
- description.Value = (description.Value.Substring(0, UDDIConstants.MAX_description_length - 1));
- }
+ ds.AddRange(Common2UDDI.mapdescription(sb.ToString(), locallang));
}
}
else
{
-
- description description = new description();
- description.lang = (lang);
- if (description.lang != null && description.lang.Length > UDDIConstants.MAX_xml_lang_length)
- {
- lengthwarn = true;
- description.lang = (description.lang.Substring(0, UDDIConstants.MAX_xml_lang_length - 1));
- }
- description.Value = (serviceDescription);
- if (service.description == null)
- service.description = new uddi.apiv3.description[] { description };
-
- if (description.Value != null && description.Value.Length > UDDIConstants.MAX_description_length)
- {
- lengthwarn = true;
- description.Value = (description.Value.Substring(0, UDDIConstants.MAX_description_length - 1));
- }
+ ds.AddRange(Common2UDDI.mapdescription(serviceDescription, lang));
+
}
-
+ service.description = ds.ToArray();
// Service name
@@ -282,7 +264,7 @@ namespace org.apache.juddi.v3.client.map
bindingTemplate bindingTemplate = new bindingTemplate();
// Set BusinessService Key
bindingTemplate.serviceKey = (UDDIKeyConvention.getServiceKey(properties, serviceQName.getLocalPart()));
-
+ List<tModelInstanceInfo> items = new List<tModelInstanceInfo>();
if (serviceUrl != null)
{
// Set AccessPoint
@@ -294,37 +276,32 @@ namespace org.apache.juddi.v3.client.map
String bindingKey = UDDIKeyConvention.getBindingKey(properties, serviceQName, portName, serviceUrl);
bindingTemplate.bindingKey = (bindingKey);
- description description = new description();
- description.lang = (lang);
- description.Value = (getDescription(res.doc));
- bindingTemplate.description = new description[] { description };
-
+ bindingTemplate.description = Common2UDDI.mapdescription(getDescription(res.doc), lang).ToArray();
+
// reference wsdl:binding tModel
tModelInstanceInfo tModelInstanceInfoBinding = new tModelInstanceInfo();
tModelInstanceInfoBinding.tModelKey = (keyDomainURI + "binding");
instanceDetails id = new instanceDetails();
id.instanceParms= portName ;
tModelInstanceInfoBinding.instanceDetails = (id);
- description descriptionB = new description();
- descriptionB.lang = (lang);
- descriptionB.Value = ("The binding that this endpoint implements. " + bindingTemplate.description[0].Value
- + " The instanceParms specifies the port local name.");
- tModelInstanceInfoBinding.description = new description[] { descriptionB };
+
+ tModelInstanceInfoBinding.description = Common2UDDI.mapdescription("The binding that this endpoint implements. " + bindingTemplate.description[0].Value
+ + " The instanceParms specifies the port local name.", lang).ToArray();
+ items.Add(tModelInstanceInfoBinding);
tModelInstanceInfo tModelInstanceInfoPortType = new tModelInstanceInfo();
tModelInstanceInfoPortType.tModelKey = (keyDomainURI + "rest");
+ tModelInstanceInfoPortType.description = Common2UDDI.mapdescription("The wadl:Resource:base implements.", lang).ToArray();
+ items.Add(tModelInstanceInfoPortType);
- description descriptionPT = new description();
- descriptionPT.lang = (lang);
- descriptionPT.Value = ("The wadl:Resource:base implements.");
- tModelInstanceInfoPortType.description = new description[] { descriptionPT };
}
+ bindingTemplate.tModelInstanceDetails = items.ToArray();
return bindingTemplate;
}
private string getDescription(doc[] doc)
{
- if (doc == null) return "";
+ if (doc == null) return "No Description.";
StringBuilder sb = new StringBuilder();
for (int i = 0; i < doc.Length; i++)
{
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WSDL2UDDI.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WSDL2UDDI.cs?rev=1557015&r1=1557014&r2=1557015&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WSDL2UDDI.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WSDL2UDDI.cs Fri Jan 10 02:52:45 2014
@@ -15,6 +15,7 @@
*
*/
+using org.apache.juddi.client.org.apache.juddi.v3.client.mapping;
using org.apache.juddi.jaxb;
using org.apache.juddi.v3.client.config;
using org.apache.juddi.v3.client.log;
@@ -531,10 +532,8 @@ namespace org.apache.juddi.v3.client.map
{
serviceDescription = properties.getProperty(Property.SERVICE_DESCRIPTION, Property.DEFAULT_SERVICE_DESCRIPTION);
}
- description description = new description();
- description.lang = (lang);
- description.Value = (serviceDescription);
- service.description = new description[] { (description) };
+
+ service.description = Common2UDDI.mapdescription(serviceDescription, lang).ToArray();
// Service name
name sName = new name();
sName.lang = (lang);
@@ -660,10 +659,7 @@ namespace org.apache.juddi.v3.client.map
if (String.IsNullOrEmpty(bindingDescription))
bindingDescription = properties.getProperty(Property.BINDING_DESCRIPTION, Property.DEFAULT_BINDING_DESCRIPTION); ;
- description description = new description();
- description.lang = (lang);
- description.Value = (bindingDescription);
- bindingTemplate.description = new description[] { (description) };
+ bindingTemplate.description = Common2UDDI.mapdescription(bindingDescription, lang).ToArray();
// reference wsdl:binding tModel
@@ -672,11 +668,9 @@ namespace org.apache.juddi.v3.client.map
instanceDetails instanceDetails = new instanceDetails();
instanceDetails.instanceParms = (portName);
tModelInstanceInfoBinding.instanceDetails = (instanceDetails);
- description descriptionB = new description();
- descriptionB.lang = (lang);
- descriptionB.Value = ("The wsdl:binding that this wsdl:port implements. " + bindingDescription
- + " The instanceParms specifies the port local name.");
- tModelInstanceInfoBinding.description = new uddi.apiv3.description[] { description };
+
+ tModelInstanceInfoBinding.description = Common2UDDI.mapdescription("The wsdl:binding that this wsdl:port implements. " + bindingDescription
+ + " The instanceParms specifies the port local name.", lang).ToArray();
tii.Add(tModelInstanceInfoBinding);
@@ -693,10 +687,8 @@ namespace org.apache.juddi.v3.client.map
portTypeDescription += it.Current.Value;
}
}
- description descriptionPT = new description();
- descriptionPT.lang = (lang);
- descriptionPT.Value = ("The wsdl:portType that this wsdl:port implements." + portTypeDescription);
- tModelInstanceInfoPortType.description = new description[] { (descriptionPT) };
+
+ tModelInstanceInfoPortType.description = Common2UDDI.mapdescription("The wsdl:portType that this wsdl:port implements." + portTypeDescription,lang).ToArray();
tii.Add(tModelInstanceInfoPortType);
bindingTemplate.tModelInstanceDetails = tii.ToArray();
Modified: juddi/trunk/juddi-client.net/readme.txt
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/readme.txt?rev=1557015&r1=1557014&r2=1557015&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/readme.txt (original)
+++ juddi/trunk/juddi-client.net/readme.txt Fri Jan 10 02:52:45 2014
@@ -10,7 +10,7 @@ Build Instructions
msbuild.exe juddi-client.net\juddi-client.net.sln /p:Configuration=Debug /p:Platform="Any CPU" /m
Tests
-"%NUNIT_HOME%\bin\nunit-console.exe" juddi-client.net\juddi-client.net.test\bin\Debug\juddi-client.net.test.dll
+"%NUNIT_HOME%\bin\nunit-console.exe" juddi-client.net.test\bin\Debug\juddi-client.net.test.dll
Integration Tests
Start Tomcat or a container with jUDDIv3.war deployed (and working!)
@@ -25,3 +25,7 @@ Start your own .NET project
Add a reference to juddi-client.net.dll
Add a copy of juddi-client.net-sample\uddi.xml (set it to copy to output directory always)
Follow the patterns in the example projects and consult the documentation
+
+
+Important, you'll want to run in your code something similar to what's in the code for juddi-client-installer.
+It's purpose to solely to register the logging system with windows and it requires elevated privledges to do so.
\ No newline at end of file
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/Common2UDDI.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/Common2UDDI.java?rev=1557015&r1=1557014&r2=1557015&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/Common2UDDI.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/Common2UDDI.java Fri Jan 10 02:52:45 2014
@@ -32,7 +32,6 @@ public abstract class Common2UDDI {
if (content == null) {
return ret;
}
- System.out.println("enter " + content.length());
if (content.length() > UDDIConstants.MAX_description_length) {
int offset = 0;
while (offset < content.length()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org