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/11/19 13:30:10 UTC
svn commit: r1543402 [1/2] - in /juddi/trunk: juddi-client.net/
juddi-client.net/example/AspnetServiceLifeCycle/
juddi-client.net/juddi-client.net-integration.test/
juddi-client.net/juddi-client.net-sample/
juddi-client.net/juddi-client.net.cryptor/ ju...
Author: alexoree
Date: Tue Nov 19 12:30:09 2013
New Revision: 1543402
URL: http://svn.apache.org/r1543402
Log:
JUDDI-716 added test cases
JUDDI-717 fixing some of the digital signature java apps
JUDDI-567 added additional integration tests
JUDDI-718 fixed
JUDDI-652 altered juddi gui code to reduce log output during normal ops
Added:
juddi/trunk/juddi-client.net/juddi-client.net-integration.test/installcert.bat
juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigfile.xml
juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigwinstore.xml
juddi/trunk/juddi-client.net/juddi-client.net.cryptor/
juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Program.cs
juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Properties/
juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Properties/AssemblyInfo.cs
juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor-mono.csproj
juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor.csproj
juddi/trunk/juddi-examples/more-uddi-samples/keystore.jks (with props)
juddi/trunk/juddi-examples/more-uddi-samples/truststore.jks (with props)
Modified:
juddi/trunk/juddi-client.net/example/AspnetServiceLifeCycle/global.asa
juddi/trunk/juddi-client.net/juddi-client.net-integration.test/DigitalSignatureIntegrationTests.cs
juddi/trunk/juddi-client.net/juddi-client.net-integration.test/InquiryTests.cs
juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test-mono.csproj
juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test.csproj
juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddi.xml
juddi/trunk/juddi-client.net/juddi-client.net-mono.sln
juddi/trunk/juddi-client.net/juddi-client.net-sample/DigitalSignaturesExample.cs
juddi/trunk/juddi-client.net/juddi-client.net-sample/uddi.xml
juddi/trunk/juddi-client.net/juddi-client.net.sln
juddi/trunk/juddi-client.net/juddi-client.net.test/CryptoTests.cs
juddi/trunk/juddi-client.net/juddi-client.net.test/DigitalSignatureTests.cs
juddi/trunk/juddi-client.net/juddi-client.net.test/SerializationTests.cs
juddi/trunk/juddi-client.net/juddi-client.net.test/uddi.xml
juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net-mono.csproj
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/AES256Cryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/DigSigUtil.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/TripleDESCryptor.cs
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/TokenTest.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
Modified: juddi/trunk/juddi-client.net/example/AspnetServiceLifeCycle/global.asa
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/example/AspnetServiceLifeCycle/global.asa?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/example/AspnetServiceLifeCycle/global.asa (original)
+++ juddi/trunk/juddi-client.net/example/AspnetServiceLifeCycle/global.asa Tue Nov 19 12:30:09 2013
@@ -7,15 +7,13 @@
void Application_Start(object sender, EventArgs e)
{
// Code that runs on application startup
-
- Type t = typeof(HelloImpl);
UDDIClient clerkManager = null;
Transport transport = null;
UDDIClerk clerk = null;
clerkManager = new UDDIClient("uddi.xml");
UDDIClientContainer.addClient(clerkManager);
- clerkManager.registerAnnotatedServices();
+ clerkManager.start();
}
</script>
Modified: juddi/trunk/juddi-client.net/juddi-client.net-integration.test/DigitalSignatureIntegrationTests.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-integration.test/DigitalSignatureIntegrationTests.cs?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-integration.test/DigitalSignatureIntegrationTests.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-integration.test/DigitalSignatureIntegrationTests.cs Tue Nov 19 12:30:09 2013
@@ -1,15 +1,196 @@
-using NUnit.Framework;
+/*
+ * 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 NUnit.Framework;
+using org.apache.juddi.jaxb;
+using org.apache.juddi.v3.client;
+using org.apache.juddi.v3.client.config;
+using org.apache.juddi.v3.client.cryptor;
+using org.apache.juddi.v3.client.transport;
+using org.uddi.apiv3;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.IO;
+using System.Net;
+using System.Threading;
namespace juddi_client.net_integration.test
{
[TestFixture]
public class DigitalSignatureIntegrationTests
{
- //TODO create, save in juddi, download from juddi, verify sig is valid
+ [TestFixtureSetUp]
+ public static void init()
+ {
+
+
+ WebClient c = new WebClient();
+
+ Console.Out.WriteLine("Checking to see if tomcat is running");
+ String s = null;
+ int count = 100;
+ while (s == null && count > 0)
+ {
+ try
+ {
+ s = c.DownloadString("http://localhost:8080/");
+ Console.Out.WriteLine("Tomcat is running");
+ break;
+ }
+ catch
+ { }
+ Console.Out.WriteLine("tomcat isn't running yet, waiting...");
+ Thread.Sleep(1000);
+ }
+
+ if (s == null)
+ {
+ Console.Out.WriteLine("Unable to confirm if tomcat is running, aborting");
+ online = false;
+ }
+
+ }
+ static Boolean online = true;
+
+ string path = "";
+ bool serialize = false;
+ public DigitalSignatureIntegrationTests()
+ {
+
+ if (Environment.GetEnvironmentVariable("debug") != null
+ && Environment.GetEnvironmentVariable("debug").Equals("true", StringComparison.CurrentCultureIgnoreCase))
+ {
+ serialize = true;
+ }
+ Console.Out.WriteLine(Directory.GetCurrentDirectory());
+ path = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + "resources";
+ if (!Directory.Exists(path))
+ {
+ path = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + ".." + Path.DirectorySeparatorChar + ".." + Path.DirectorySeparatorChar + ".." + Path.DirectorySeparatorChar + "juddi-client.net.test" + Path.DirectorySeparatorChar + "resources" + Path.DirectorySeparatorChar;
+ Console.Out.WriteLine(path);
+ }
+ if (!Directory.Exists(path))
+ {
+ path = Environment.GetEnvironmentVariable("JUDDI_TEST_RES");
+ Console.Out.WriteLine(path);
+ }
+ if (path == null || !Directory.Exists(path))
+ {
+ path = null;
+ Console.Out.WriteLine("uh oh, I can't find the resources directory, override with the environment variable JUDDI_TEST_RES=<path>");
+ }
+
+ }
+
+ [Test]
+ public void fromWindowsStore()
+ {
+ Assume.That(online);
+ Console.Out.WriteLine("DigitalSignatureIntegration fromWindowsstore");
+ SignSaveAndVerifyToJuddi("uddisigwinstore.xml");
+ }
+
+ [Test]
+ public void fromFile()
+ {
+ Assume.That(online);
+ Console.Out.WriteLine("DigitalSignatureIntegration fromFile");
+ SignSaveAndVerifyToJuddi( "uddisigfile.xml");
+ }
+
+ /// <summary>
+ /// From file
+ /// create business, save in juddi, download from juddi, sign and save it,
+ /// download it again, verify sig is valid
+ /// </summary>
+ /// <param name="config"></param>
+ void SignSaveAndVerifyToJuddi(String config)
+ {
+ UDDIClient clerkManager = null;
+ Transport transport = null;
+ UDDIClerk clerk = null;
+ try
+ {
+ clerkManager = new UDDIClient(config);
+ UDDIClientContainer.addClient(clerkManager);
+ transport = clerkManager.getTransport("default");
+ UDDI_Security_SoapBinding security = transport.getUDDISecurityService();
+ UDDI_Inquiry_SoapBinding inquiry = transport.getUDDIInquiryService();
+ UDDI_Publication_SoapBinding publish = transport.getUDDIPublishService();
+ clerk = clerkManager.getClerk("default");
+
+ businessEntity be = new businessEntity();
+ be.name = new name[] { new name("Test biz", "en") };
+
+ Console.Out.WriteLine("saving test biz");
+ businessEntity complete = clerk.register(be);
+ Console.Out.WriteLine("attempting to sign");
+
+ DigSigUtil ds = new DigSigUtil(clerkManager.getClientConfig().getDigitalSignatureConfiguration());
+ businessEntity signed = (businessEntity)ds.signUddiEntity(complete);
+
+ PrintUDDI<businessEntity> p = new PrintUDDI<businessEntity>();
+ Console.Out.WriteLine("signed successfully!");
+ if (serialize)
+ Console.Out.WriteLine(p.print(signed));
+
+ Console.Out.WriteLine("attempting verify signature locally");
+ String err = "";
+ bool valid = ds.verifySignedUddiEntity(signed, out err);
+ Console.Out.WriteLine("Signature is " + (valid ? "Valid, Yippy!" : "Invalid!") + " msg: " + err);
+ Assert.True(valid);
+ Assert.True(String.IsNullOrEmpty(err));
+
+ Console.Out.WriteLine("saving to signed entity to the registry");
+ clerk.register(signed);
+ Console.Out.WriteLine("reloading content from the server...");
+
+ get_businessDetail gsd = new get_businessDetail();
+ gsd.authInfo = clerk.getAuthToken(clerk.getUDDINode().getSecurityUrl());
+ gsd.businessKey = new string[] { signed.businessKey };
+ businessDetail saved = inquiry.get_businessDetail(gsd);
+
+ Console.Out.WriteLine("done. attempting verify signed entity");
+ if (serialize)
+ Console.Out.WriteLine(p.print(saved.businessEntity[0]));
+
+ err = "";
+ valid = ds.verifySignedUddiEntity(saved.businessEntity[0], out err);
+ Console.Out.WriteLine("Signature is " + (valid ? "Valid, Yippy!" : "Invalid!") + " msg: " + err);
+
+ }
+ catch (Exception ex)
+ {
+ while (ex != null)
+ {
+ System.Console.WriteLine("Error! " + ex.Message);
+ ex = ex.InnerException;
+ }
+ throw ex;
+ }
+ finally
+ {
+ if (transport != null && transport is IDisposable)
+ {
+ ((IDisposable)transport).Dispose();
+ }
+ if (clerk != null)
+ clerk.Dispose();
+ }
+ }
+
//TODO create in JAVA, save in juddi, download in .NET, verify sig is valid
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net-integration.test/InquiryTests.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-integration.test/InquiryTests.cs?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-integration.test/InquiryTests.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-integration.test/InquiryTests.cs Tue Nov 19 12:30:09 2013
@@ -25,10 +25,17 @@ namespace juddi_client.net_integration.t
static org.uddi.apiv3.UDDI_Publication_SoapBinding publish = null;
static org.uddi.apiv3.UDDI_Subscription_SoapBinding sub = null;
static bool online = true;
+ static bool serialize = false;
[TestFixtureSetUp]
public static void init()
{
+ if (Environment.GetEnvironmentVariable("debug") != null
+ && Environment.GetEnvironmentVariable("debug").Equals("true", StringComparison.CurrentCultureIgnoreCase))
+ {
+ serialize = true;
+ }
+
clerkManager = new UDDIClient("uddi.xml");
UDDIClientContainer.addClient(clerkManager);
@@ -43,7 +50,7 @@ namespace juddi_client.net_integration.t
WebClient c = new WebClient();
Console.Out.WriteLine("Checking to see if tomcat is running");
- String s=null;
+ String s = null;
int count = 100;
while (s == null && count > 0)
{
@@ -53,7 +60,7 @@ namespace juddi_client.net_integration.t
Console.Out.WriteLine("Tomcat is running");
break;
}
- catch
+ catch
{ }
Console.Out.WriteLine("tomcat isn't running yet, waiting...");
Thread.Sleep(1000);
@@ -85,7 +92,8 @@ namespace juddi_client.net_integration.t
Assert.IsNotNullOrEmpty(bl.businessInfos[i].businessKey);
}
PrintUDDI<businessList> p = new PrintUDDI<businessList>();
- Console.Out.WriteLine(p.print(bl));
+ if (serialize)
+ Console.Out.WriteLine(p.print(bl));
}
@@ -107,7 +115,8 @@ namespace juddi_client.net_integration.t
Assert.IsNotNullOrEmpty(bl.serviceInfos[i].serviceKey);
}
PrintUDDI<serviceList> p = new PrintUDDI<serviceList>();
- Console.Out.WriteLine(p.print(bl));
+ if (serialize)
+ Console.Out.WriteLine(p.print(bl));
}
[Test]
@@ -128,10 +137,11 @@ namespace juddi_client.net_integration.t
Assert.NotNull(bl.tModelInfos[i].name);
}
PrintUDDI<tModelList> p = new PrintUDDI<tModelList>();
- Console.Out.WriteLine(p.print(bl));
+ if (serialize)
+ Console.Out.WriteLine(p.print(bl));
}
-
+
}
}
Added: juddi/trunk/juddi-client.net/juddi-client.net-integration.test/installcert.bat
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-integration.test/installcert.bat?rev=1543402&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-integration.test/installcert.bat (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net-integration.test/installcert.bat Tue Nov 19 12:30:09 2013
@@ -0,0 +1,3 @@
+@echo off
+echo The password is 'password' without the quotes!
+sn.exe -i ../juddi-client.net.test/resources/cert.pfx my
\ No newline at end of file
Modified: juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test-mono.csproj
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test-mono.csproj?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test-mono.csproj (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test-mono.csproj Tue Nov 19 12:30:09 2013
@@ -30,6 +30,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+<PropertyGroup>
+ <StartupObject />
+ </PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -54,12 +57,24 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <Content Include="uddisigwinstore.xml">
+ <SubType>Designer</SubType>
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="uddisigfile.xml">
+ <SubType>Designer</SubType>
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="uddi.xml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PostBuildEvent>cd $(OutDir)
+rem C:\juddi\NUnit-2.6.1\bin\nunit-console.exe $(TargetFileName)</PostBuildEvent>
+ </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Modified: juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test.csproj
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test.csproj?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test.csproj (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-integration.test/juddi-client.net-integration.test.csproj Tue Nov 19 12:30:09 2013
@@ -30,6 +30,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup>
+ <StartupObject />
+ </PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -54,12 +57,24 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <Content Include="uddisigwinstore.xml">
+ <SubType>Designer</SubType>
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="uddisigfile.xml">
+ <SubType>Designer</SubType>
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="uddi.xml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PostBuildEvent>cd $(OutDir)
+rem C:\juddi\NUnit-2.6.1\bin\nunit-console.exe $(TargetFileName)</PostBuildEvent>
+ </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Modified: juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddi.xml?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddi.xml (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddi.xml Tue Nov 19 12:30:09 2013
@@ -55,21 +55,27 @@
</clerks>
<signature>
- <signingKeyStorePath>CURRENT-USER</signingKeyStorePath>
- <signingKeyStoreType>WINDOWS</signingKeyStoreType>
- <signingKeyStoreFilePassword>ignored</signingKeyStoreFilePassword>
+ <signingKeyStorePath>..\..\..\juddi-client.net.test\resources\cert.pfx</signingKeyStorePath>
+ <signingKeyStoreType>PFX</signingKeyStoreType>
+ <signingKeyStoreFilePassword>password</signingKeyStoreFilePassword>
<signingKeyPassword>ignored</signingKeyPassword>
- <signingKeyAlias>SERIAL</signingKeyAlias>
+
+ <!-- this is the localhost Test certificate -->
+ <signingKeyAlias>?518ed27c</signingKeyAlias>
<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
- <signatureMethod>RSA_SHA1</signatureMethod>
+ <signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
- <trustStorePath>CURRENT-USER</trustStorePath>
- <trustStoreType>WINDOWS</trustStoreType>
+ <trustStorePath>ignored</trustStorePath>
+ <trustStoreType>ignored</trustStoreType>
<trustStorePassword>ignored</trustStorePassword>
<checkTimestamps>true</checkTimestamps>
- <checkTrust>true</checkTrust>
- <checkRevocationCRL>true</checkRevocationCRL>
+ <checkTrust>false</checkTrust>
+ <checkRevocationCRL>false</checkRevocationCRL>
<checkRevocationOCSP>false</checkRevocationOCSP>
+ <keyInfoInclusionSubjectDN>true</keyInfoInclusionSubjectDN>
+ <keyInfoInclusionSerial>true</keyInfoInclusionSerial>
+ <keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey>
+ <digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod>
</signature>
<subscriptionCallbacks>
<keyDomain>uddi:org.apache.juddi</keyDomain>
Added: juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigfile.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigfile.xml?rev=1543402&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigfile.xml (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigfile.xml Tue Nov 19 12:30:09 2013
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:juddi-apache-org:v3_client ..\..\juddi-client\src\main\resources\xsd\uddi-client.xsd">
+ <reloadDelay>5000</reloadDelay>
+ <client name="test-client">
+ <nodes>
+ <node isHomeJUDDI="true">
+ <!-- required 'default' node -->
+ <name>default</name>
+ <description>Main jUDDI node</description>
+ <properties>
+ <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.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>
+
+ <factoryInitial>not used</factoryInitial>
+ <factoryURLPkgs>not used</factoryURLPkgs>
+ <factoryNamingProvider>not used</factoryNamingProvider>
+ </node>
+ </nodes>
+
+ <clerks registerOnStartup="false">
+ <clerk name="default" node="default" publisher="uddi" password="uddi" isPasswordEncrypted="false" cryptoProvider=""/>
+
+ </clerks>
+ <signature>
+ <signingKeyStorePath>..\..\..\juddi-client.net.test\resources\cert.pfx</signingKeyStorePath>
+ <signingKeyStoreType>PFX</signingKeyStoreType>
+ <signingKeyStoreFilePassword>password</signingKeyStoreFilePassword>
+ <signingKeyPassword>ignored</signingKeyPassword>
+
+ <!-- this is the localhost Test certificate -->
+ <signingKeyAlias>â518ed27c</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <trustStorePath>ignored</trustStorePath>
+ <trustStoreType>ignored</trustStoreType>
+ <trustStorePassword>ignored</trustStorePassword>
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>false</checkTrust>
+ <checkRevocationCRL>false</checkRevocationCRL>
+ <checkRevocationOCSP>false</checkRevocationOCSP>
+ <keyInfoInclusionSubjectDN>true</keyInfoInclusionSubjectDN>
+ <keyInfoInclusionSerial>false</keyInfoInclusionSerial>
+ <keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey>
+ <digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:org.apache.juddi</keyDomain>
+ <listenUrl>http://localhost:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:org.apache.juddi:callbackServices</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
+ </client>
+</uddi>
\ No newline at end of file
Added: juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigwinstore.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigwinstore.xml?rev=1543402&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigwinstore.xml (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net-integration.test/uddisigwinstore.xml Tue Nov 19 12:30:09 2013
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:juddi-apache-org:v3_client ..\..\juddi-client\src\main\resources\xsd\uddi-client.xsd">
+ <reloadDelay>5000</reloadDelay>
+ <client name="test-client">
+ <nodes>
+ <node isHomeJUDDI="true">
+ <!-- required 'default' node -->
+ <name>default</name>
+ <description>Main jUDDI node</description>
+ <properties>
+ <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.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>
+ <factoryInitial>not used</factoryInitial>
+ <factoryURLPkgs>not used</factoryURLPkgs>
+ <factoryNamingProvider>not used</factoryNamingProvider>
+ </node>
+ </nodes>
+
+ <clerks registerOnStartup="false">
+ <clerk name="default" node="default" publisher="uddi" password="uddi" isPasswordEncrypted="false" cryptoProvider=""/>
+
+ </clerks>
+ <signature>
+ <signingKeyStorePath>My</signingKeyStorePath>
+ <signingKeyStoreType>CurrentUser</signingKeyStoreType>
+ <signingKeyStoreFilePassword>ignored</signingKeyStoreFilePassword>
+ <signingKeyPassword>ignored</signingKeyPassword>
+
+ <!-- this is the localhost Test certificate -->
+ <signingKeyAlias>â518ed27c</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <trustStorePath>ignored</trustStorePath>
+ <trustStoreType>ignored</trustStoreType>
+ <trustStorePassword>ignored</trustStorePassword>
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>false</checkTrust>
+ <checkRevocationCRL>false</checkRevocationCRL>
+ <checkRevocationOCSP>false</checkRevocationOCSP>
+ <keyInfoInclusionSubjectDN>true</keyInfoInclusionSubjectDN>
+ <keyInfoInclusionSerial>false</keyInfoInclusionSerial>
+ <keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey>
+ <digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:org.apache.juddi</keyDomain>
+ <listenUrl>http://localhost:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:org.apache.juddi:callbackServices</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
+ </client>
+</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-client.net/juddi-client.net-mono.sln
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-mono.sln?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-mono.sln (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-mono.sln Tue Nov 19 12:30:09 2013
@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "juddi-client.net-sample-mono", "juddi-client.net-sample\juddi-client.net-sample-mono.csproj", "{7FA52B63-F70A-4EC7-8390-CC7C1C9C6B84}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "juddi-client.net.cryptor-mono", "juddi-client.net.cryptor\juddi-client.net.cryptor-mono.csproj", "{15F6DF2F-82AF-49AA-B449-6E21F8409845}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -48,6 +50,10 @@ Global
{7FA52B63-F70A-4EC7-8390-CC7C1C9C6B84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7FA52B63-F70A-4EC7-8390-CC7C1C9C6B84}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7FA52B63-F70A-4EC7-8390-CC7C1C9C6B84}.Release|Any CPU.Build.0 = Release|Any CPU
+ {15F6DF2F-82AF-49AA-B449-6E21F8409845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {15F6DF2F-82AF-49AA-B449-6E21F8409845}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {15F6DF2F-82AF-49AA-B449-6E21F8409845}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {15F6DF2F-82AF-49AA-B449-6E21F8409845}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: juddi/trunk/juddi-client.net/juddi-client.net-sample/DigitalSignaturesExample.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/DigitalSignaturesExample.cs?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-sample/DigitalSignaturesExample.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-sample/DigitalSignaturesExample.cs Tue Nov 19 12:30:09 2013
@@ -1,5 +1,4 @@
-using org.apache.juddi.jaxb;
-/*
+/*
* Copyright 2001-2008 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,7 @@
* 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.cryptor;
@@ -58,6 +58,7 @@ namespace org.apache.juddi.client.sample
Console.Out.WriteLine("attempting to sign");
serviceDetail sd = clerk.getServiceDetail(bl.businessInfos[0].serviceInfos[0].serviceKey);
+ //pist, the signing config comes from the stuff in in uddi.xml
DigSigUtil ds = new DigSigUtil(clerkManager.getClientConfig().getDigitalSignatureConfiguration());
businessService signedsvc = (businessService)ds.signUddiEntity(sd.businessService[0]);
PrintUDDI<businessService> p = new PrintUDDI<businessService>();
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=1543402&r1=1543401&r2=1543402&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 Nov 19 12:30:09 2013
@@ -90,22 +90,28 @@
TrustedPeople
TrustedPublisher-->
<signingKeyStorePath>My</signingKeyStorePath>
- <!-- storelocation
- CurrentUser
- LocalMachine
+
+ <!-- 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>
- <signingKeyStoreFilePassword>ignored</signingKeyStoreFilePassword>
+
+ <!-- only used when signingKeyStoreType is "PFX-->
+ <signingKeyStoreFilePassword cryptoProvider="" isPasswordEncrypted="false">ignored</signingKeyStoreFilePassword>
+
+ <!-- not used-->
<signingKeyPassword>ignored</signingKeyPassword>
- <!-- serial number-->
+ <!-- serial number or friendly name/alias, subject or thumbprint-->
<signingKeyAlias>â514a6615</signingKeyAlias>
<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
<signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- trust store always goes to the windows certificate store -->
<trustStorePath>ignored</trustStorePath>
<trustStoreType>ignored</trustStoreType>
<trustStorePassword>ignored</trustStorePassword>
+
<checkTimestamps>true</checkTimestamps>
<checkTrust>true</checkTrust>
<checkRevocationCRL>true</checkRevocationCRL>
Added: juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Program.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Program.cs?rev=1543402&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Program.cs (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Program.cs Tue Nov 19 12:30:09 2013
@@ -0,0 +1,97 @@
+using org.apache.juddi.v3.client.cryptor;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace juddi_client.net.cryptor
+{
+ class Program
+ {
+ static void Main(string[] args)
+ {
+ Console.Out.WriteLine("Select cryptographic method (CRTL-C to quit)");
+ Console.Out.WriteLine("1) org.apache.juddi.v3.client.cryptor.AES256Cryptor");
+ Console.Out.WriteLine("2) org.apache.juddi.v3.client.cryptor.AES128Cryptor");
+ Console.Out.WriteLine("3) org.apache.juddi.v3.client.cryptor.TripleDESCryptor");
+ Console.Out.Write("Selection > ");
+ string cryptor = Console.In.ReadLine();
+
+ int i = -1;
+ try
+ {
+ i = Int32.Parse(cryptor);
+ }
+ catch { }
+ while (i < 1 && i > 3)
+ {
+ Console.Out.Write("Selection > ");
+ i = -1;
+ try
+ {
+ i = Int32.Parse(cryptor);
+ }
+ catch { }
+ }
+
+ Console.Out.Write("Password to encrypt > ");
+ string pwd = ReadPassword('*');
+ switch (i)
+ {
+ case 1:
+ Console.Out.WriteLine(org.apache.juddi.v3.client.cryptor.CryptorFactory.getCryptor(CryptorFactory.AES256).encrypt(pwd));
+ break;
+ case 2:
+ Console.Out.WriteLine(org.apache.juddi.v3.client.cryptor.CryptorFactory.getCryptor(CryptorFactory.AES128).encrypt(pwd));
+ break;
+ case 3:
+ Console.Out.WriteLine(org.apache.juddi.v3.client.cryptor.CryptorFactory.getCryptor(CryptorFactory.TripleDES).encrypt(pwd));
+ break;
+ }
+
+ }
+
+ /// <summary>
+ /// Like System.Console.ReadLine(), only with a mask. Source: http://stackoverflow.com/questions/3404421/password-masking-console-application
+ /// </summary>
+ /// <param name="mask">a <c>char</c> representing your choice of console mask</param>
+ /// <returns>the string the user typed in </returns>
+ public static string ReadPassword(char mask)
+ {
+ const int ENTER = 13, BACKSP = 8, CTRLBACKSP = 127;
+ int[] FILTERED = { 0, 27, 9, 10 /*, 32 space, if you care */ }; // const
+
+ var pass = new Stack<char>();
+ char chr = (char)0;
+
+ while ((chr = System.Console.ReadKey(true).KeyChar) != ENTER)
+ {
+ if (chr == BACKSP)
+ {
+ if (pass.Count > 0)
+ {
+ System.Console.Write("\b \b");
+ pass.Pop();
+ }
+ }
+ else if (chr == CTRLBACKSP)
+ {
+ while (pass.Count > 0)
+ {
+ System.Console.Write("\b \b");
+ pass.Pop();
+ }
+ }
+ else if (FILTERED.Count(x => chr == x) > 0) { }
+ else
+ {
+ pass.Push((char)chr);
+ System.Console.Write(mask);
+ }
+ }
+
+ System.Console.WriteLine();
+
+ return new string(pass.Reverse().ToArray());
+ }
+ }
+}
Added: juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Properties/AssemblyInfo.cs?rev=1543402&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Properties/AssemblyInfo.cs (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net.cryptor/Properties/AssemblyInfo.cs Tue Nov 19 12:30:09 2013
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("juddi-client.net.cryptor")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
+[assembly: AssemblyProduct("Apache jUDDI")]
+[assembly: AssemblyCopyright("Copyright © Apache Software Foundation 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("bd032357-c66a-4619-b2a4-1453d20e176d")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("3.2.0.0")]
+[assembly: AssemblyFileVersion("3.2.0.0")]
Added: juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor-mono.csproj
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor-mono.csproj?rev=1543402&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor-mono.csproj (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor-mono.csproj Tue Nov 19 12:30:09 2013
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{15F6DF2F-82AF-49AA-B449-6E21F8409845}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>juddi_client.net.cryptor</RootNamespace>
+ <AssemblyName>juddi-client.net.cryptor</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Runtime.Serialization" />
+ <Reference Include="System.Security" />
+ <Reference Include="System.ServiceModel" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Program.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\juddi-client.net\juddi-client.net-mono.csproj">
+ <Project>{c3d005cd-6c26-49fd-a4d8-08699b66af6f}</Project>
+ <Name>juddi-client.net-mono</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor.csproj
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor.csproj?rev=1543402&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor.csproj (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net.cryptor/juddi-client.net.cryptor.csproj Tue Nov 19 12:30:09 2013
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{15F6DF2F-82AF-49AA-B449-6E21F8409845}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>juddi_client.net.cryptor</RootNamespace>
+ <AssemblyName>juddi-client.net.cryptor</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Runtime.Serialization" />
+ <Reference Include="System.Security" />
+ <Reference Include="System.ServiceModel" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Program.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\juddi-client.net\juddi-client.net.csproj">
+ <Project>{c3d005cd-6c26-49fd-a4d8-08699b66af6f}</Project>
+ <Name>juddi-client.net</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Modified: juddi/trunk/juddi-client.net/juddi-client.net.sln
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.sln?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.sln (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net.sln Tue Nov 19 12:30:09 2013
@@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "juddi-client.net-integration.test", "juddi-client.net-integration.test\juddi-client.net-integration.test.csproj", "{ABE1C470-52E1-4C28-AB1D-91F1CD7B89C0}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "juddi-client.net.cryptor", "juddi-client.net.cryptor\juddi-client.net.cryptor.csproj", "{15F6DF2F-82AF-49AA-B449-6E21F8409845}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -45,6 +47,10 @@ Global
{ABE1C470-52E1-4C28-AB1D-91F1CD7B89C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABE1C470-52E1-4C28-AB1D-91F1CD7B89C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABE1C470-52E1-4C28-AB1D-91F1CD7B89C0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {15F6DF2F-82AF-49AA-B449-6E21F8409845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {15F6DF2F-82AF-49AA-B449-6E21F8409845}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {15F6DF2F-82AF-49AA-B449-6E21F8409845}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {15F6DF2F-82AF-49AA-B449-6E21F8409845}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: juddi/trunk/juddi-client.net/juddi-client.net.test/CryptoTests.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/CryptoTests.cs?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/CryptoTests.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/CryptoTests.cs Tue Nov 19 12:30:09 2013
@@ -13,6 +13,7 @@ namespace juddi_client.net.test
[Test]
public void AES128()
{
+ Console.Out.WriteLine("Cryptor AES128");
Cryptor c = org.apache.juddi.v3.client.cryptor.CryptorFactory.getCryptor(CryptorFactory.AES128);
TestCryptor(c);
}
@@ -31,6 +32,7 @@ namespace juddi_client.net.test
[Test]
public void AES256()
{
+ Console.Out.WriteLine("Cryptor AES256");
Cryptor c = org.apache.juddi.v3.client.cryptor.CryptorFactory.getCryptor(CryptorFactory.AES256);
TestCryptor(c);
}
@@ -38,6 +40,7 @@ namespace juddi_client.net.test
[Test]
public void TripleDES()
{
+ Console.Out.WriteLine("Cryptor TripleDES");
Cryptor c = org.apache.juddi.v3.client.cryptor.CryptorFactory.getCryptor(CryptorFactory.TripleDES);
TestCryptor(c);
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net.test/DigitalSignatureTests.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/DigitalSignatureTests.cs?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/DigitalSignatureTests.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/DigitalSignatureTests.cs Tue Nov 19 12:30:09 2013
@@ -77,7 +77,7 @@ namespace juddi_client.net.test
[Test]
public void Business()
{
-
+ Console.Out.WriteLine("DigitalSignature biz");
businessEntity be = new businessEntity();
be.businessKey = "uddi:business";
be.businessServices = new businessService[] { NewBusinessService() };
@@ -96,6 +96,7 @@ namespace juddi_client.net.test
private businessService NewBusinessService()
{
+
businessService bs = new businessService();
bs.bindingTemplates = new bindingTemplate[] { NewBindingTempalte() };
bs.businessKey = "asd";
@@ -121,6 +122,7 @@ namespace juddi_client.net.test
[Test]
public void Service()
{
+ Console.Out.WriteLine("DigitalSignature svc");
businessService bs = NewBusinessService();
SigningAndVerify(bs);
}
@@ -128,6 +130,7 @@ namespace juddi_client.net.test
[Test]
public void Tmodel()
{
+ Console.Out.WriteLine("DigitalSignature tmodel");
tModel bs = UDDIClerk.createKeyGenator("part", "desc", "en");
SigningAndVerify(bs);
Modified: juddi/trunk/juddi-client.net/juddi-client.net.test/SerializationTests.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/SerializationTests.cs?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/SerializationTests.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/SerializationTests.cs Tue Nov 19 12:30:09 2013
@@ -38,7 +38,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_subscriptionResultsList()
{
-
+ Console.Out.WriteLine("serialization xr_subscriptionResultsList");
subscriptionResultsList r = new subscriptionResultsList();
XmlSerializer xr = new XmlSerializer(typeof(subscriptionResultsList));
StringWriter sw = new StringWriter();
@@ -49,7 +49,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_subscriptionFilter()
{
-
+ Console.Out.WriteLine("serialization xr_subscriptionFilter");
subscriptionFilter r = new subscriptionFilter();
XmlSerializer xr = new XmlSerializer(typeof(subscriptionFilter));
StringWriter sw = new StringWriter();
@@ -61,6 +61,7 @@ namespace juddi_client.net_mono_test
public void xr_categoryBag()
{
+ Console.Out.WriteLine("serialization categorybag");
categoryBag r = new categoryBag();
XmlSerializer xr = new XmlSerializer(typeof(categoryBag));
StringWriter sw = new StringWriter();
@@ -71,7 +72,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_find_relatedBusinesses()
{
-
+ Console.Out.WriteLine("serialization xr_find_relatedBusinesses");
find_relatedBusinesses r = new find_relatedBusinesses();
XmlSerializer xr = new XmlSerializer(typeof(find_relatedBusinesses));
StringWriter sw = new StringWriter();
@@ -82,7 +83,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_keysOwned()
{
-
+ Console.Out.WriteLine("serialization keysOwned");
keysOwned r = new keysOwned();
XmlSerializer xr = new XmlSerializer(typeof(keysOwned));
StringWriter sw = new StringWriter();
@@ -94,6 +95,7 @@ namespace juddi_client.net_mono_test
public void xr_bindingTemplate()
{
+ Console.Out.WriteLine("serialization bindingTemplate");
bindingTemplate r = new bindingTemplate();
XmlSerializer xr = new XmlSerializer(typeof(bindingTemplate));
StringWriter sw = new StringWriter();
@@ -104,7 +106,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_instanceDetails()
{
-
+ Console.Out.WriteLine("serialization instanceDetails");
instanceDetails r = new instanceDetails();
XmlSerializer xr = new XmlSerializer(typeof(instanceDetails));
StringWriter sw = new StringWriter();
@@ -115,7 +117,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_TransformType()
{
-
+ Console.Out.WriteLine("serialization TransformType");
TransformType r = new TransformType();
XmlSerializer xr = new XmlSerializer(typeof(TransformType));
StringWriter sw = new StringWriter();
@@ -127,7 +129,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_KeyInfoType()
{
-
+ Console.Out.WriteLine("serialization KeyInfoType");
KeyInfoType r = new KeyInfoType();
XmlSerializer xr = new XmlSerializer(typeof(KeyInfoType));
StringWriter sw = new StringWriter();
@@ -139,7 +141,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_KeyValueType()
{
-
+ Console.Out.WriteLine("serialization xr_KeyValueType");
KeyValueType r = new KeyValueType();
XmlSerializer xr = new XmlSerializer(typeof(KeyValueType));
StringWriter sw = new StringWriter();
@@ -152,7 +154,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_PGPDataType()
{
-
+ Console.Out.WriteLine("serialization xr_PGPDataType");
PGPDataType r = new PGPDataType();
XmlSerializer xr = new XmlSerializer(typeof(PGPDataType));
StringWriter sw = new StringWriter();
@@ -164,7 +166,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_X509DataType()
{
-
+ Console.Out.WriteLine("serialization xr_X509DataType");
X509DataType r = new X509DataType();
XmlSerializer xr = new XmlSerializer(typeof(X509DataType));
StringWriter sw = new StringWriter();
@@ -175,7 +177,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_keyBag1()
{
-
+ Console.Out.WriteLine("serialization xr_keyBag1");
keyBag1 r = new keyBag1();
XmlSerializer xr = new XmlSerializer(typeof(keyBag1));
StringWriter sw = new StringWriter();
@@ -187,7 +189,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_SignaturePropertyType()
{
-
+ Console.Out.WriteLine("serialization xr_SignaturePropertyType");
SignaturePropertyType r = new SignaturePropertyType();
XmlSerializer xr = new XmlSerializer(typeof(SignaturePropertyType));
StringWriter sw = new StringWriter();
@@ -198,7 +200,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_validate_values()
{
-
+ Console.Out.WriteLine("serialization xr_validate_values");
validate_values r = new validate_values();
XmlSerializer xr = new XmlSerializer(typeof(validate_values));
StringWriter sw = new StringWriter();
@@ -208,7 +210,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_discard_transferToken()
{
-
+ Console.Out.WriteLine("serialization xr_discard_transferToken");
discard_transferToken r = new discard_transferToken();
XmlSerializer xr = new XmlSerializer(typeof(discard_transferToken));
StringWriter sw = new StringWriter();
@@ -219,7 +221,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_get_changeRecords()
{
-
+ Console.Out.WriteLine("serialization xr_get_changeRecords");
get_changeRecords r = new get_changeRecords();
XmlSerializer xr = new XmlSerializer(typeof(get_changeRecords));
StringWriter sw = new StringWriter();
@@ -230,7 +232,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_changeRecordNewData()
{
-
+ Console.Out.WriteLine("serialization xr_changeRecordNewData");
changeRecordNewData r = new changeRecordNewData();
XmlSerializer xr = new XmlSerializer(typeof(changeRecordNewData));
StringWriter sw = new StringWriter();
@@ -241,7 +243,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_overviewDoc()
{
-
+ Console.Out.WriteLine("serialization xr_overviewDoc");
overviewDoc r = new overviewDoc();
description d = new description("v", "en");
overviewURL ol = new overviewURL("http://url", "website");
@@ -264,6 +266,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_subscriptionResultsListws()
{
+ Console.Out.WriteLine("serialization xr_subscriptionResultsListws");
subscriptionResultsList r = new subscriptionResultsList();
UDDIClient clerkManager = null;
Transport transport = null;
@@ -303,6 +306,7 @@ namespace juddi_client.net_mono_test
[Test]
public void xr_subscriptionFilterws()
{
+ Console.Out.WriteLine("serialization xr_subscriptionFilterws");
Console.Out.WriteLine("xr_subscriptionFilterws");
subscriptionFilter r = new subscriptionFilter();
UDDIClient clerkManager = null;
@@ -355,204 +359,6 @@ namespace juddi_client.net_mono_test
return true;
return false;
}
- /*
- [Test]
- public void xr_categoryBag()
- {
-
- categoryBag r = new categoryBag();
- XmlSerializer xr = new XmlSerializer(typeof(categoryBag));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_find_relatedBusinesses()
- {
-
- find_relatedBusinesses r = new find_relatedBusinesses();
- XmlSerializer xr = new XmlSerializer(typeof(find_relatedBusinesses));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_keysOwned()
- {
-
- keysOwned r = new keysOwned();
- XmlSerializer xr = new XmlSerializer(typeof(keysOwned));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_bindingTemplate()
- {
-
- bindingTemplate r = new bindingTemplate();
- XmlSerializer xr = new XmlSerializer(typeof(bindingTemplate));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_instanceDetails()
- {
-
- instanceDetails r = new instanceDetails();
- XmlSerializer xr = new XmlSerializer(typeof(instanceDetails));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_TransformType()
- {
-
- TransformType r = new TransformType();
- XmlSerializer xr = new XmlSerializer(typeof(TransformType));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
-
- [Test]
- public void xr_KeyInfoType()
- {
-
- KeyInfoType r = new KeyInfoType();
- XmlSerializer xr = new XmlSerializer(typeof(KeyInfoType));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
-
- [Test]
- public void xr_KeyValueType()
- {
-
- KeyValueType r = new KeyValueType();
- XmlSerializer xr = new XmlSerializer(typeof(KeyValueType));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
-
-
- [Test]
- public void xr_PGPDataType()
- {
-
- PGPDataType r = new PGPDataType();
- XmlSerializer xr = new XmlSerializer(typeof(PGPDataType));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
-
- [Test]
- public void xr_X509DataType()
- {
-
- X509DataType r = new X509DataType();
- XmlSerializer xr = new XmlSerializer(typeof(X509DataType));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_keyBag1()
- {
-
- keyBag1 r = new keyBag1();
- XmlSerializer xr = new XmlSerializer(typeof(keyBag1));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
-
- [Test]
- public void xr_SignaturePropertyType()
- {
-
- SignaturePropertyType r = new SignaturePropertyType();
- XmlSerializer xr = new XmlSerializer(typeof(SignaturePropertyType));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_validate_values()
- {
-
- validate_values r = new validate_values();
- XmlSerializer xr = new XmlSerializer(typeof(validate_values));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
- [Test]
- public void xr_discard_transferToken()
- {
-
- discard_transferToken r = new discard_transferToken();
- XmlSerializer xr = new XmlSerializer(typeof(discard_transferToken));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_get_changeRecords()
- {
-
- get_changeRecords r = new get_changeRecords();
- XmlSerializer xr = new XmlSerializer(typeof(get_changeRecords));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_changeRecordNewData()
- {
-
- changeRecordNewData r = new changeRecordNewData();
- XmlSerializer xr = new XmlSerializer(typeof(changeRecordNewData));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }
-
- [Test]
- public void xr_overviewDoc()
- {
-
- overviewDoc r = new overviewDoc();
- description d = new description("v","en");
- overviewURL ol = new overviewURL("http://url","website");
-
- r.Items = new object[] {d ,ol};
- XmlSerializer xr = new XmlSerializer(typeof(overviewDoc));
- StringWriter sw = new StringWriter();
- xr.Serialize(sw, r);
- System.Console.Out.WriteLine(sw.ToString());
- }*/
-
-
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net.test/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/uddi.xml?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/uddi.xml (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/uddi.xml Tue Nov 19 12:30:09 2013
@@ -55,21 +55,27 @@
</clerks>
<signature>
- <signingKeyStorePath>CURRENT-USER</signingKeyStorePath>
- <signingKeyStoreType>WINDOWS</signingKeyStoreType>
- <signingKeyStoreFilePassword>ignored</signingKeyStoreFilePassword>
+ <signingKeyStorePath>..\..\..\juddi-client.net.test\resources\cert.pfx</signingKeyStorePath>
+ <signingKeyStoreType>PFX</signingKeyStoreType>
+ <signingKeyStoreFilePassword>password</signingKeyStoreFilePassword>
<signingKeyPassword>ignored</signingKeyPassword>
- <signingKeyAlias>SERIAL</signingKeyAlias>
+
+ <!-- this is the localhost Test certificate -->
+ <signingKeyAlias>?518ed27c</signingKeyAlias>
<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
- <signatureMethod>RSA_SHA1</signatureMethod>
+ <signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
- <trustStorePath>CURRENT-USER</trustStorePath>
- <trustStoreType>WINDOWS</trustStoreType>
+ <trustStorePath>ignored</trustStorePath>
+ <trustStoreType>ignored</trustStoreType>
<trustStorePassword>ignored</trustStorePassword>
<checkTimestamps>true</checkTimestamps>
- <checkTrust>true</checkTrust>
- <checkRevocationCRL>true</checkRevocationCRL>
+ <checkTrust>false</checkTrust>
+ <checkRevocationCRL>false</checkRevocationCRL>
<checkRevocationOCSP>false</checkRevocationOCSP>
+ <keyInfoInclusionSubjectDN>true</keyInfoInclusionSubjectDN>
+ <keyInfoInclusionSerial>true</keyInfoInclusionSerial>
+ <keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey>
+ <digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod>
</signature>
<subscriptionCallbacks>
<keyDomain>uddi:org.apache.juddi</keyDomain>
Modified: juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net-mono.csproj
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net-mono.csproj?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net-mono.csproj (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net-mono.csproj Tue Nov 19 12:30:09 2013
@@ -20,7 +20,7 @@
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
- <WarningLevel>1</WarningLevel>
+ <WarningLevel>4</WarningLevel>
<RunCodeAnalysis>true</RunCodeAnalysis>
<DocumentationFile>bin\Debug\juddi-dotnet-client.XML</DocumentationFile>
</PropertyGroup>
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/AES256Cryptor.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/AES256Cryptor.cs?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/AES256Cryptor.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/AES256Cryptor.cs Tue Nov 19 12:30:09 2013
@@ -26,7 +26,7 @@ namespace org.apache.juddi.v3.client.cry
/// AES256 Cipher
/// </summary>
/// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
- public sealed class AES256Cryptor : AESCryptor
+ internal sealed class AES256Cryptor : AESCryptor
{
protected internal override int GetKeySize()
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/DigSigUtil.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/DigSigUtil.cs?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/DigSigUtil.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/DigSigUtil.cs Tue Nov 19 12:30:09 2013
@@ -443,6 +443,7 @@ namespace org.apache.juddi.v3.client.cry
return bt;
}
+
private X509Certificate2 GetKey()
{
@@ -451,6 +452,7 @@ namespace org.apache.juddi.v3.client.cry
{
logger.info("Attempting to load certificate from " + map.getProperty(DigSigUtil.SIGNATURE_KEYSTORE_FILE));
X509Certificate2 cert = new X509Certificate2(map.getProperty(DigSigUtil.SIGNATURE_KEYSTORE_FILE),
+ //this should be decrypted already
map.getProperty(DigSigUtil.SIGNATURE_KEYSTORE_FILE_PASSWORD));
return cert;
@@ -469,7 +471,10 @@ namespace org.apache.juddi.v3.client.cry
if (cert.HasPrivateKey)
{
//do some comparisions
- if (cert.SerialNumber.Equals(keyserial, StringComparison.CurrentCultureIgnoreCase))
+ if (cert.SerialNumber.Equals(keyserial, StringComparison.CurrentCultureIgnoreCase) ||
+ cert.FriendlyName.Equals(keyserial, StringComparison.CurrentCultureIgnoreCase) ||
+ cert.Subject.Equals(keyserial, StringComparison.CurrentCultureIgnoreCase) ||
+ cert.Thumbprint.Equals(keyserial, StringComparison.CurrentCultureIgnoreCase))
{
store.Close();
return cert;
@@ -482,7 +487,7 @@ namespace org.apache.juddi.v3.client.cry
}
- XmlDocument StringToXmlDocument(String s)
+ private XmlDocument StringToXmlDocument(String s)
{
XmlDocument xmlDoc = new XmlDocument();
xmlDoc.PreserveWhitespace = false;
@@ -492,6 +497,7 @@ namespace org.apache.juddi.v3.client.cry
//source http://objectmix.com/dotnet/794749-digitally-sign-xml-doc-x509certificate-solution.html
+ //which came from the msdn tutorial
//Certificate get Signature method
private XmlElement SignXml(XmlDocument xmlDoc, X509Certificate2 cert)
@@ -566,46 +572,5 @@ namespace org.apache.juddi.v3.client.cry
return xmlDoc;
}
-
- //GET CERT BY FRIENDLYNAME
- public X509Certificate2 GetCertificateBySubject(string subject)
- {
- X509Certificate2 cert = null;
-
- try
- {
-
- X509Store xstore = new X509Store(StoreName.Root,
- StoreLocation.LocalMachine);
- xstore.Open(OpenFlags.IncludeArchived);
-
-
- string strOutput = string.Empty;
-
- foreach (X509Certificate2 cert2 in xstore.Certificates)
- {
-
- if (cert2.FriendlyName == subject.ToString())
- {
- cert = cert2;
- break;
- }
-
- }
- }
- catch (Exception ex)
- {
- logger.error("", ex);
-
- throw ex;
- }
-
- return cert;
- }
-
-
-
-
-
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/TripleDESCryptor.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/TripleDESCryptor.cs?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/TripleDESCryptor.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.cryptor/TripleDESCryptor.cs Tue Nov 19 12:30:09 2013
@@ -27,7 +27,7 @@ namespace org.apache.juddi.v3.client.cry
/// 3DES Ciphers
/// </summary>
/// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
- public sealed class TripleDESCryptor : Cryptor
+ internal sealed class TripleDESCryptor : Cryptor
{
/**
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java Tue Nov 19 12:30:09 2013
@@ -8,11 +8,17 @@ package org.apache.juddi.v3.client;
public interface UDDIConstants {
/**
- * identifies a tmodel instance info containing some version information of a service
- * a juddi extension based on
+ * identifies a tmodel instance info containing some version information of
+ * a service a juddi extension based on
* http://www.ibm.com/developerworks/webservices/library/ws-version/
*/
public static final String VERSION_TMODEL = "urn:uddi:uddi.org:version";
+ /**
+ * When using this tModel as a tModelInstance, it can be used to describe a
+ * service endpoint that was automatically registered by jUDDI. This is a
+ * jUDDI specific addon and may not be present in other registries.
+ */
+ public static final String JUDDI_TMODEL_AUTOREG = "uddi:juddi.apache.org:autoregistration";
public static final int MAX_xml_lang_length = 26;
public static final int MAX_description_length = 255;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Tue Nov 19 12:30:09 2013
@@ -364,8 +364,8 @@ public class ClientConfig
p.setProperty(DigSigUtil.CHECK_REVOCATION_STATUS_OCSP, ((Boolean) (this.config.getBoolean("client.signature.checkRevocationOCSP", true))).toString());
p.setProperty(DigSigUtil.CHECK_TRUST_CHAIN, ((Boolean) (this.config.getBoolean("client.signature.checkTrust", true))).toString());
- p.setProperty(DigSigUtil.SIGNATURE_KEYSTORE_FILE, this.config.getString("client.signature.signingKeyStorePath"));
- p.setProperty(DigSigUtil.SIGNATURE_KEYSTORE_FILETYPE, this.config.getString("client.signature.signingKeyStoreType"));
+ p.setProperty(DigSigUtil.SIGNATURE_KEYSTORE_FILE, this.config.getString("client.signature.signingKeyStorePath",""));
+ p.setProperty(DigSigUtil.SIGNATURE_KEYSTORE_FILETYPE, this.config.getString("client.signature.signingKeyStoreType",""));
if (this.config.getBoolean("client.signature.signingKeyPassword[@isPasswordEncrypted]", false)) {
String enc = this.config.getString("client.signature.signingKeyPassword");
@@ -384,16 +384,16 @@ public class ClientConfig
p.setProperty(DigSigUtil.SIGNATURE_KEYSTORE_FILE_PASSWORD, this.config.getString("client.signature.signingKeyStoreFilePassword"));
}
- p.setProperty(DigSigUtil.SIGNATURE_KEYSTORE_KEY_ALIAS, this.config.getString("client.signature.signingKeyAlias"));
+ p.setProperty(DigSigUtil.SIGNATURE_KEYSTORE_KEY_ALIAS, this.config.getString("client.signature.signingKeyAlias",""));
p.setProperty(DigSigUtil.SIGNATURE_METHOD, this.config.getString("client.signature.signatureMethod", "http://www.w3.org/2000/09/xmldsig#rsa-sha1"));
- p.setProperty(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_SUBJECTDN, this.config.getString("client.signature.keyInfoInclusionSubjectDN"));
- p.setProperty(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, this.config.getString("client.signature.keyInfoInclusionBase64PublicKey"));
- p.setProperty(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_SERIAL, this.config.getString("client.signature.keyInfoInclusionSerial"));
+ p.setProperty(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_SUBJECTDN, this.config.getString("client.signature.keyInfoInclusionSubjectDN","true"));
+ p.setProperty(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, this.config.getString("client.signature.keyInfoInclusionBase64PublicKey","true"));
+ p.setProperty(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_SERIAL, this.config.getString("client.signature.keyInfoInclusionSerial","true"));
p.setProperty(DigSigUtil.SIGNATURE_OPTION_DIGEST_METHOD, this.config.getString("client.signature.digestMethod", "http://www.w3.org/2000/09/xmldsig#sha1"));
- p.setProperty(DigSigUtil.TRUSTSTORE_FILE, this.config.getString("client.signature.trustStorePath"));
- p.setProperty(DigSigUtil.TRUSTSTORE_FILETYPE, this.config.getString("client.signature.trustStoreType"));
+ p.setProperty(DigSigUtil.TRUSTSTORE_FILE, this.config.getString("client.signature.trustStorePath",""));
+ p.setProperty(DigSigUtil.TRUSTSTORE_FILETYPE, this.config.getString("client.signature.trustStoreType",""));
if (this.config.getBoolean("client.signature.trustStorePassword[@isPasswordEncrypted]", false)) {
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java Tue Nov 19 12:30:09 2013
@@ -44,6 +44,7 @@ public class UDDIClerkServlet extends Ht
manager = WebHelper.getUDDIClient(config.getServletContext());
if (manager.getClientConfig().isRegisterOnStartup()) {
manager.registerWSDLs();
+ manager.registerAnnotatedServices();
}
} catch (Exception e) {
logger.error("UDDI-client could not be started for manager " + manager.getName() + ". "
Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml Tue Nov 19 12:30:09 2013
@@ -64,7 +64,10 @@
</nodes>
<clerks registerOnStartup="false" >
- <clerk name="default" node="default" publisher="root" password="root"/>
+ <clerk name="default" node="default" publisher="userjoe" password="******" >
+ <!--<wsdl businessKey="" businessName="" keyDomain=""></wsdl>-->
+ <class></class>
+ </clerk>
<clerk name="medroot" node="med" publisher="root" password="root"/>
<xregister>
<service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/TokenTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/TokenTest.java?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/TokenTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/TokenTest.java Tue Nov 19 12:30:09 2013
@@ -16,16 +16,10 @@
package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
-import org.apache.juddi.api.impl.UDDIPublicationImplExt;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.Registry;
-import org.apache.juddi.api.impl.UDDIPublicationImpl;
-import org.apache.juddi.api.impl.UDDIPublicationImpl;
-import org.apache.juddi.api.impl.UDDISecurityImpl;
-import org.apache.juddi.api.impl.UDDISecurityImpl;
-import org.apache.juddi.auth.MockWebServiceContext;
import org.apache.juddi.auth.MockWebServiceContext;
import org.apache.juddi.v3.error.AuthTokenRequiredException;
import org.apache.juddi.v3.tck.TckBusiness;
@@ -38,8 +32,6 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.uddi.api_v3.AuthToken;
-import org.uddi.api_v3.GetAuthToken;
import org.uddi.v3_service.UDDISecurityPortType;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org