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/02/08 04:21:26 UTC
svn commit: r1565898 [1/4] - in /juddi/trunk:
juddi-client.net/juddi-client.net-sample/
juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/
juddi-client.net/juddi-client.net/
juddi-client.net/juddi-client.net/bindings/ juddi-clien...
Author: alexoree
Date: Sat Feb 8 03:21:26 2014
New Revision: 1565898
URL: http://svn.apache.org/r1565898
Log:
JUDDI-835 fixed
JUDDI-832 added but needs testing, some minor corrections to java mappings
Added:
juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2.cs
juddi/trunk/juddi-client.net/juddi-client.net/bindings/UDDIv2_Service.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/MapUDDIv2to3.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/
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
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/bindings.cs
juddi/trunk/juddi-client.net/juddi-client.net/bindings/datamodel.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.config/UDDIClient.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetTransport.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/Transport.cs
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java
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=1565898&r1=1565897&r2=1565898&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 Sat Feb 8 03:21:26 2014
@@ -42,6 +42,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="org.apache.juddi.client.samples\AccessUDDIv2.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/AccessUDDIv2.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2.cs?rev=1565898&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2.cs (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net-sample/org.apache.juddi.client.samples/AccessUDDIv2.cs Sat Feb 8 03:21:26 2014
@@ -0,0 +1,80 @@
+/*
+ * 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 AccessUDDIv2
+ {
+ 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);
+
+ }
+ // 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();
+ }
+ }
+ }
+}
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=1565898&r1=1565897&r2=1565898&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 Sat Feb 8 03:21:26 2014
@@ -15,6 +15,7 @@
*
*/
using org.apache.juddi.client.sample.juddi;
+using org.apache.juddi.client.samples;
using System;
@@ -35,6 +36,7 @@ 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.Write("Enter selection> ");
String selection = Console.In.ReadLine();
selection = selection.Trim();
@@ -58,6 +60,8 @@ namespace org.apache.juddi.client.sample
SubscriptionCallbackExample.Run(args);
else if (selection.Equals("10"))
DigitalSignaturesExample.Run(args);
+ else if (selection.Equals("11"))
+ AccessUDDIv2.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=1565898&r1=1565897&r2=1565898&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 Sat Feb 8 03:21:26 2014
@@ -3,7 +3,7 @@
<reloadDelay>5000</reloadDelay>
<client name="test-client">
<nodes>
- <!-- hint, there can be more than one "node"-->
+ <!-- hint, there can be more than one "node"-->
<node isHomeJUDDI="true">
<!-- required 'default' node -->
<name>default</name>
@@ -16,28 +16,28 @@
<!-- for a dev instance of jUDDI, use this url -->
<property name="serverName" value="localhost" />
<property name="serverPort" value="8080" />
-
- <!-- for UDDI nodes that use HTTP u/p, using the following
+
+ <!-- for UDDI nodes that use HTTP u/p, using the following
<property name="basicAuthUsername" value="root" />
<property name="basicAuthPassword" value="password" />
<property name="basicAuthPasswordIsEncrypted" value="false" />
<property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
</properties>
<proxyTransport>org.apache.juddi.v3.client.transport.AspNetTransport</proxyTransport>
- <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
- <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
- <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
- <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
- <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
- <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
- <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
- <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</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>
<factoryInitial>not used</factoryInitial>
<factoryURLPkgs>not used</factoryURLPkgs>
<factoryNamingProvider>not used</factoryNamingProvider>
</node>
- <node isHomeJUDDI="true">
+ <node>
<!-- required 'default' node -->
<name>default_non_root</name>
<description>Main jUDDI node</description>
@@ -57,28 +57,70 @@
<property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
</properties>
<proxyTransport>org.apache.juddi.v3.client.transport.AspNetTransport</proxyTransport>
- <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
- <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
- <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
- <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
- <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
- <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
- <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</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>
+ <factoryInitial>not used</factoryInitial>
+ <factoryURLPkgs>not used</factoryURLPkgs>
+ <factoryNamingProvider>not used</factoryNamingProvider>
+ </node>
+
+
+
+ <node>
+ <!-- required 'default' node -->
+ <name>uddiv2</name>
+ <description>Main jUDDI node</description>
+ <properties>
+ <!-- for a live instance of jUDDI, use this url
+ <property name="serverName" value="uddi-jbossoverlord.rhcloud.com" />
+ <property name="serverPort" value="80" />-->
+
+ <!-- for a dev instance of jUDDI, use this url -->
+ <property name="serverName" value="localhost" />
+ <property name="serverPort" value="8080" />
+
+ <!-- for UDDI nodes that use HTTP u/p, using the following
+ <property name="basicAuthUsername" value="root" />
+ <property name="basicAuthPassword" value="password" />
+ <property name="basicAuthPasswordIsEncrypted" value="false" />
+ <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>
+
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryv2</inquiryUrl>
+
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publishv2</publishUrl>
+
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</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>
<factoryInitial>not used</factoryInitial>
<factoryURLPkgs>not used</factoryURLPkgs>
<factoryNamingProvider>not used</factoryNamingProvider>
</node>
+
+
+
</nodes>
<clerks registerOnStartup="false">
<!-- one clerk for each node is required-->
<clerk name="default" node="default" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider=""/>
<clerk name="default_non_root" node="default_non_root" publisher="uddi" password="uddi" isPasswordEncrypted="false" cryptoProvider=""/>
+ <clerk name="uddiv2" node="default_non_root" publisher="uddi" password="uddi" isPasswordEncrypted="false" cryptoProvider=""/>
<xregister>
<!-- automatic registration on start. this only triggers when registerOnStartup=true-->
<servicebinding bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="default_non_root"/>
</xregister>
-
+
</clerks>
<signature>
<!-- the store name,
@@ -91,18 +133,18 @@
TrustedPeople
TrustedPublisher-->
<signingKeyStorePath>My</signingKeyStorePath>
-
+
<!-- storelocation, this can either be CurrentUser or LocalMachine using the Windows certificate store OR
the value "PFX" to load the certificate from a PFX file
-->
<signingKeyStoreType>CurrentUser</signingKeyStoreType>
-
+
<!-- only used when signingKeyStoreType is "PFX-->
<signingKeyStoreFilePassword cryptoProvider="" isPasswordEncrypted="false">ignored</signingKeyStoreFilePassword>
-
+
<!-- not used-->
<signingKeyPassword>ignored</signingKeyPassword>
-
+
<!-- serial number or friendly name/alias, subject or thumbprint-->
<signingKeyAlias>â514a6615</signingKeyAlias>
<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
@@ -112,7 +154,7 @@
<trustStorePath>ignored</trustStorePath>
<trustStoreType>ignored</trustStoreType>
<trustStorePassword>ignored</trustStorePassword>
-
+
<checkTimestamps>true</checkTimestamps>
<checkTrust>true</checkTrust>
<checkRevocationCRL>true</checkRevocationCRL>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org