Author: alexoree
Date: Mon Sep 30 01:16:39 2013
New Revision: 1527428
URL: http://svn.apache.org/r1527428
Log:
JUDDI-567 adding test cases for crypto functions and WADL2UDDI
Added:
juddi/trunk/juddi-client.net/juddi-client.net.test/CryptoTests.cs
juddi/trunk/juddi-client.net/juddi-client.net.test/WADL2UDDITests.cs
juddi/trunk/juddi-client.net/juddi-client.net.test/resources/
juddi/trunk/juddi-client.net/juddi-client.net.test/resources/cxf.wadl
juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample.wadl
Removed:
juddi/trunk/juddi-client.net/juddi-client.net-mono-test/
Modified:
juddi/trunk/juddi-client.net/juddi-client.net-sample/Program.cs
juddi/trunk/juddi-client.net/juddi-client.net.test/SerializationTests.cs
juddi/trunk/juddi-client.net/juddi-client.net.test/juddi-client.net.test.csproj
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/DigSigUtil.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs
Modified: juddi/trunk/juddi-client.net/juddi-client.net-sample/Program.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/Program.cs?rev=1527428&r1=1527427&r2=1527428&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-sample/Program.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-sample/Program.cs Mon Sep 30
01:16:39 2013
@@ -17,11 +17,13 @@
*/
using org.apache.juddi.v3.client;
using org.apache.juddi.v3.client.config;
+using org.apache.juddi.v3.client.crypto;
using org.apache.juddi.v3.client.mapping;
using org.apache.juddi.v3.client.transport;
using org.uddi.apiv3;
using System;
using System.Collections.Generic;
+using System.Security.Cryptography;
using System.Text;
@@ -31,6 +33,72 @@ namespace juddi_client.net_sample
{
static void Main(string[] args)
{
+ AesManaged aes = new AesManaged();
+ Console.WriteLine("AesManaged ");
+ KeySizes[] ks = aes.LegalKeySizes;
+ foreach (KeySizes k in ks)
+ {
+ Console.WriteLine("\tLegal min key size = " + k.MinSize);
+ Console.WriteLine("\tLegal max key size = " + k.MaxSize);
+ }
+ ks = aes.LegalBlockSizes;
+ foreach (KeySizes k in ks)
+ {
+ Console.WriteLine("\tLegal min block size = " + k.MinSize);
+ Console.WriteLine("\tLegal max block size = " + k.MaxSize);
+ }
+
+
+ RijndaelManaged rij = new RijndaelManaged();
+ Console.WriteLine("RijndaelManaged ");
+ ks = rij.LegalKeySizes;
+ foreach (KeySizes k in ks)
+ {
+ Console.WriteLine("\tLegal min key size = " + k.MinSize);
+ Console.WriteLine("\tLegal max key size = " + k.MaxSize);
+ }
+ ks = rij.LegalBlockSizes;
+ foreach (KeySizes k in ks)
+ {
+ Console.WriteLine("\tLegal min block size = " + k.MinSize);
+ Console.WriteLine("\tLegal max block size = " + k.MaxSize);
+ }
+ TripleDESCryptoServiceProvider tsp = new
TripleDESCryptoServiceProvider();
+ Console.WriteLine("TripleDESCryptoServiceProvider ");
+ ks = tsp.LegalKeySizes;
+ foreach (KeySizes k in ks)
+ {
+ Console.WriteLine("\tLegal min key size = " + k.MinSize);
+ Console.WriteLine("\tLegal max key size = " + k.MaxSize);
+ }
+ ks = tsp.LegalBlockSizes;
+ foreach (KeySizes k in ks)
+ {
+ Console.WriteLine("\tLegal min block size = " + k.MinSize);
+ Console.WriteLine("\tLegal max block size = " + k.MaxSize);
+ }
+
+
+ using (RijndaelManaged rijAlg = new RijndaelManaged())
+ {
+ rijAlg.KeySize = 256;
+ rijAlg.BlockSize = 256;
+ rijAlg.GenerateKey();
+ rijAlg.GenerateIV();
+ Console.Out.WriteLine( rijAlg.KeySize + " " + rijAlg.BlockSize
+ " " + Convert.ToBase64String(rijAlg.IV, Base64FormattingOptions.None) + " " +
+ Convert.ToBase64String(rijAlg.Key,
Base64FormattingOptions.None));
+ }
+
+
+ TripleDESCryptoServiceProvider des = new
TripleDESCryptoServiceProvider();
+ des.KeySize = 192;
+ des.BlockSize = 64;
+ des.GenerateKey();
+ des.GenerateIV();
+ Console.Out.WriteLine(des.KeySize + " " + des.BlockSize + " " +
Convert.ToBase64String(des.IV, Base64FormattingOptions.None) + " " +
+ Convert.ToBase64String(des.Key, Base64FormattingOptions.None));
+
+
UDDIClient clerkManager = null;
Transport transport = null;
UDDIClerk clerk = null;
Added: 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=1527428&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/CryptoTests.cs (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/CryptoTests.cs Mon Sep
30 01:16:39 2013
@@ -0,0 +1,45 @@
+using NUnit.Framework;
+using org.apache.juddi.v3.client.crypto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace juddi_client.net.test
+{
+ [TestFixture]
+ public class CryptoTests
+ {
+ [Test]
+ public void AES128()
+ {
+ Cryptor c =
org.apache.juddi.v3.client.crypto.CryptorFactory.getCryptor(CryptorFactory.AES128);
+ TestCryptor(c);
+ }
+
+ private void TestCryptor(Cryptor c)
+ {
+ String cipher = c.encrypt("Password");
+ Console.Out.WriteLine(cipher);
+ Assert.False(String.IsNullOrEmpty(cipher));
+
+ String clear = c.decrypt(cipher);
+ Console.Out.WriteLine(clear);
+ Assert.False(String.IsNullOrEmpty(clear));
+ Assert.AreEqual(clear, "Password");
+ }
+ [Test]
+ public void AES256()
+ {
+ Cryptor c =
org.apache.juddi.v3.client.crypto.CryptorFactory.getCryptor(CryptorFactory.AES256);
+ TestCryptor(c);
+ }
+
+ [Test]
+ public void TripleDES()
+ {
+ Cryptor c =
org.apache.juddi.v3.client.crypto.CryptorFactory.getCryptor(CryptorFactory.TripleDES);
+ TestCryptor(c);
+ }
+ }
+}
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=1527428&r1=1527427&r2=1527428&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
Mon Sep 30 01:16:39 2013
@@ -14,19 +14,240 @@
* limitations under the License.
*
*/
-
+using NUnit.Framework;
+using org.uddi.apiv3;
using System;
using System.Collections.Generic;
-using NUnit.Framework;
+using System.IO;
+using System.Linq;
using System.Text;
+using System.Xml.Serialization;
-namespace juddi_client.net.test
+namespace juddi_client.net_mono_test
{
-
- [TestFixture]
+
+ [TestFixture]
public class SerializationTests
{
- //not needed for .net
+
+ [Test]
+ public void xr_subscriptionResultsList()
+ {
+
+ subscriptionResultsList r = new subscriptionResultsList();
+ XmlSerializer xr = new
XmlSerializer(typeof(subscriptionResultsList));
+ StringWriter sw = new StringWriter();
+ xr.Serialize(sw, r);
+ System.Console.Out.WriteLine(sw.ToString());
+ }
+
+ [Test]
+ public void xr_subscriptionFilter()
+ {
+
+ subscriptionFilter r = new subscriptionFilter();
+ XmlSerializer xr = new XmlSerializer(typeof(subscriptionFilter));
+ StringWriter sw = new StringWriter();
+ xr.Serialize(sw, r);
+ System.Console.Out.WriteLine(sw.ToString());
+ }
+
+ [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());
+ }
+
}
}
Added: juddi/trunk/juddi-client.net/juddi-client.net.test/WADL2UDDITests.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/WADL2UDDITests.cs?rev=1527428&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/WADL2UDDITests.cs (added)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/WADL2UDDITests.cs Mon
Sep 30 01:16:39 2013
@@ -0,0 +1,127 @@
+using net.java.dev.wadl;
+using NUnit.Framework;
+using org.apache.juddi.v3.client;
+using org.apache.juddi.v3.client.config;
+using org.apache.juddi.v3.client.mapping;
+using org.apache.juddi.v3.client.transport;
+using org.uddi.apiv3;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace juddi_client.net.test
+{
+ [TestFixture]
+ public class WADL2UDDITests
+ {
+ string path = "";
+ public WADL2UDDITests()
+ {
+ Console.Out.WriteLine(Directory.GetCurrentDirectory());
+ path = Directory.GetCurrentDirectory() +
Path.DirectorySeparatorChar + "resources";
+ if (!Directory.Exists(path))
+ {
+ path = Directory.GetCurrentDirectory() +
Path.DirectorySeparatorChar + ".." + Path.DirectorySeparatorChar + ".." +
Path.DirectorySeparatorChar + "resources";
+ 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 zootoolTest()
+ {
+ Assume.That(path != null);
+ runTest(path + Path.DirectorySeparatorChar + "sample.wadl");
+ }
+
+ [Test]
+ public void cxfTest()
+ {
+ Assume.That(path != null);
+ runTest(path + Path.DirectorySeparatorChar + "cxf.wadl");
+ }
+
+ [Test]
+ public void deliciouseTest()
+ {
+ Assume.That(path != null);
+ runTest(path + Path.DirectorySeparatorChar + "deliciouse.wadl");
+ }
+
+ [Test]
+ public void diggotest()
+ {
+ Assume.That(path != null);
+ runTest(path + Path.DirectorySeparatorChar + "diggo.wadl");
+ }
+
+
+ [Test]
+ public void hbookmarkstest()
+ {
+ Assume.That(path != null);
+ runTest(path + Path.DirectorySeparatorChar + "hbookmarks.wadl");
+ }
+
+ void runTest(String pathAndFile)
+ {
+ Assume.That(File.Exists(pathAndFile));
+ //Wadl Import example
+
+ UDDIClient clerkManager = null;
+ Transport transport = null;
+ UDDIClerk clerk = null;
+ clerkManager = new UDDIClient("uddi.xml");
+ UDDIClientContainer.addClient(clerkManager);
+
+ transport = clerkManager.getTransport("default");
+ clerk = clerkManager.getClerk("default");
+
+ application app = WADL2UDDI.ParseWadl(pathAndFile);
+ List<Uri> urls = WADL2UDDI.GetBaseAddresses(app);
+ Assert.True(urls.Count > 0);
+ Uri url = urls[0];
+ String domain = url.Host;
+
+ tModel keygen = UDDIClerk.createKeyGenator("uddi:" + domain +
":keygenerator", domain, "en");
+ Assert.NotNull(keygen);
+ Assert.NotNull(keygen.tModelKey);
+ Properties properties = new Properties();
+ properties.put("keyDomain", domain);
+ properties.put("businessName", domain);
+ properties.put("serverName", url.Host);
+ properties.put("serverPort", url.Port.ToString());
+ WADL2UDDI wadl2UDDI = new WADL2UDDI(clerk, properties);
+ businessService businessServices =
wadl2UDDI.createBusinessService(new QName("MyWasdl.namespace", "Servicename"),
app);
+ Assert.NotNull(businessServices);
+ Assert.NotNull(businessServices.bindingTemplates);
+ foreach (bindingTemplate bt in businessServices.bindingTemplates)
+ {
+ Assert.NotNull(bt);
+ Assert.NotNull(bt.bindingKey);
+ Assert.NotNull(bt.Item);
+ Assert.NotNull(bt.serviceKey);
+ Assert.True(bt.Item is accessPoint);
+ Assert.NotNull(((accessPoint)bt.Item).useType);
+ Assert.NotNull(((accessPoint)bt.Item).Value);
+ }
+ Assert.True(businessServices.bindingTemplates.Length > 0);
+ Assert.NotNull(businessServices.description);
+ Assert.True(businessServices.description.Length > 0);
+ Assert.NotNull(businessServices.serviceKey);
+
+
+
+ }
+ }
+}
Modified:
juddi/trunk/juddi-client.net/juddi-client.net.test/juddi-client.net.test.csproj
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/juddi-client.net.test.csproj?rev=1527428&r1=1527427&r2=1527428&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net.test/juddi-client.net.test.csproj
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net.test/juddi-client.net.test.csproj
Mon Sep 30 01:16:39 2013
@@ -56,14 +56,34 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="SerializationTests.cs" />
+ <Compile Include="CryptoTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="SerializationTests.cs" />
+ <Compile Include="WADL2UDDITests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference
Include="..\example\AspnetServiceLifeCycle\AspnetServiceLifeCycle.csproj">
+ <Project>{53f50b81-088b-4593-9f1c-f3d3f499f28c}</Project>
+ <Name>AspnetServiceLifeCycle</Name>
+ </ProjectReference>
+ <ProjectReference
Include="..\example\WcfServiceLifeCycle\WcfServiceLifeCycle.csproj">
+ <Project>{072f737e-86e5-4b8e-a7fb-864a3abb0d9a}</Project>
+ <Name>WcfServiceLifeCycle</Name>
+ </ProjectReference>
+ <ProjectReference
Include="..\juddi-client.net-sample\juddi-client.net-sample.csproj">
+ <Project>{7fa52b63-f70a-4ec7-8390-cc7c1c9c6b84}</Project>
+ <Name>juddi-client.net-sample</Name>
+ </ProjectReference>
+ <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.
Added: juddi/trunk/juddi-client.net/juddi-client.net.test/resources/cxf.wadl
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/resources/cxf.wadl?rev=1527428&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/resources/cxf.wadl
(added)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/resources/cxf.wadl Mon
Sep 30 01:16:39 2013
@@ -0,0 +1,35 @@
+<application xmlns="http://wadl.dev.java.net/2009/02";
xmlns:ns="http://superbooks";>
+ <grammars>
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:tns="http://superbooks"; attributeFormDefault="unqualified"
elementFormDefault="unqualified"
+ targetNamespace="http://superbooks";>
+ <xs:element name="thebook" type="tns:book"/>
+ <xs:complexType name="book">
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="tns:thechapter"/>
+ <xs:element name="id" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </grammars>
+ <resources base="http://localhost:8080/";>
+ <resource path="/bookstore/{id}">
+ <param name="id" style="template"/>
+ <method name="GET">
+ <response>
+ <representation mediaType="application/xml" element="ns:thebook"/>
+ </response>
+ </method>
+ </resource>
+ <resource path="/books">
+ <resource path="/bookstore/{id}">
+ <param name="id" style="template"/>
+ <method name="GET">
+ <response>
+ <representation mediaType="application/xml" element="ns:thebook"/>
+ </response>
+ </method>
+ </resource>
+ </resource>
+ </resources>
+</application>
\ No newline at end of file
Added: juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample.wadl
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample.wadl?rev=1527428&view=auto
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample.wadl
(added)
+++ juddi/trunk/juddi-client.net/juddi-client.net.test/resources/sample.wadl
Mon Sep 30 01:16:39 2013
@@ -0,0 +1,47 @@
+<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://wadl.dev.java.net/2009/02 wadl.xsd"
+ xmlns:tns="urn:yahoo:yn"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:yn="urn:yahoo:yn"
+ xmlns:ya="urn:yahoo:api"
+ xmlns="http://wadl.dev.java.net/2009/02";>
+ <grammars>
+ <include
+ href="NewsSearchResponse.xsd"/>
+ <include
+ href="Error.xsd"/>
+ </grammars>
+
+ <resources base="http://api.search.yahoo.com/NewsSearchService/V1/";>
+ <resource path="newsSearch">
+ <method name="GET" id="search">
+ <request>
+ <param name="appid" type="xsd:string"
+ style="query" required="true"/>
+ <param name="query" type="xsd:string"
+ style="query" required="true"/>
+ <param name="type" style="query" default="all">
+ <option value="all"/>
+ <option value="any"/>
+ <option value="phrase"/>
+ </param>
+ <param name="results" style="query" type="xsd:int" default="10"/>
+ <param name="start" style="query" type="xsd:int" default="1"/>
+ <param name="sort" style="query" default="rank">
+ <option value="rank"/>
+ <option value="date"/>
+ </param>
+ <param name="language" style="query" type="xsd:string"/>
+ </request>
+ <response status="200">
+ <representation mediaType="application/xml"
+ element="yn:ResultSet"/>
+ </response>
+ <response status="400">
+ <representation mediaType="application/xml"
+ element="ya:Error"/>
+ </response>
+ </method>
+ </resource>
+ </resources>
+</application>
\ No newline at end of file
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs?rev=1527428&r1=1527427&r2=1527428&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES128Cryptor.cs
Mon Sep 30 01:16:39 2013
@@ -32,6 +32,11 @@ namespace org.apache.juddi.v3.client.cry
return 128;
}
+ protected internal override int GetBlockSize()
+ {
+ return 128;
+ }
+
protected internal override byte[] GetKey()
{
return Convert.FromBase64String("oT5ljhVnMVQMnV2E7BOj7Q==");
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs?rev=1527428&r1=1527427&r2=1527428&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AES256Cryptor.cs
Mon Sep 30 01:16:39 2013
@@ -17,7 +17,7 @@
using System;
using System.Collections.Generic;
-
+using System.Security.Cryptography;
using System.Text;
namespace org.apache.juddi.v3.client.crypto
@@ -26,7 +26,7 @@ namespace org.apache.juddi.v3.client.cry
/// AES256 Cipher
/// </summary>
/// <author><a href="mailto:[email protected]";>Alex O'Ree</a></author>
- internal sealed class AES256Cryptor : AESCryptor
+ public sealed class AES256Cryptor : AESCryptor
{
protected internal override int GetKeySize()
@@ -34,14 +34,58 @@ namespace org.apache.juddi.v3.client.cry
return 256;
}
+ protected internal override int GetBlockSize()
+ {
+ return 256;
+ }
+
+ public String generateKey()
+ {
+
+ /* AesManaged
+ Legal min key size = 128
+ Legal max key size = 256
+ Legal min block size = 128
+ Legal max block size = 128*/
+ using (RijndaelManaged rijAlg = new RijndaelManaged())
+ {
+ rijAlg.KeySize = 256;
+ rijAlg.BlockSize = 256;
+ rijAlg.GenerateKey();
+ rijAlg.GenerateIV();
+ return rijAlg.KeySize + " " + rijAlg.BlockSize + " " +
Convert.ToBase64String(rijAlg.IV, Base64FormattingOptions.None) + " " +
+ Convert.ToBase64String(rijAlg.Key,
Base64FormattingOptions.None);
+ }
+
+ }
protected internal override byte[] GetKey()
{
- return
Convert.FromBase64String("K48QmIsRr0xQD+WOwyg+fJWGS8K1M82V8XKn+/IzPo0=");
+ //256 256
+
+ //
+ //OI3xpA3ju175rBFDbgNek9fvQOXMhLNpktgm4+mDvvQ=
+ //tK47Y1FE1JragvCmanbzsA==
+ //yEt6Jn1rEnFFmWduUEu7fxki31k3/TPOzhzHXrKhd4U=
+
+ //256
+ //gAyHDYd4hwYru2ofV41KEw==
+ //2LsXyePZKqYRyxks/9mXiiMewNo5Ai8KDz8FNSi/OvU=
+
+
+ //zR5gURV+ZeJ9pzYIymEwkg==
+ //xgFJ6zCSBB7OAWo3v2y5H1JO4VYlRyxA5Z4gIOOBUzY=
+
+ //9jjQB84Xx1fA5D0vS8EWqA==
+ //RLzwr0D+wnoOPcl4lHPPILPN1TLaH89u0la2+GFWIFY=
+
+ //auWb4YCYAuZQ/joSieu8bg==
+ //VlfjcIggVX5QlvwAKzKmaI92q1ADZgop5RRsQUW8sXQ=
+ return
Convert.FromBase64String("OI3xpA3ju175rBFDbgNek9fvQOXMhLNpktgm4+mDvvQ=");
}
protected internal override byte[] GetIV()
{
- return Convert.FromBase64String("Ro80zsaX0a4PLtyXuFKq6Q==");
+ return
Convert.FromBase64String("19BWwWbtICJkI04WpBkMBkURJTTRB0gIyUyiVgXcaCw= ");
}
}
}
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs?rev=1527428&r1=1527427&r2=1527428&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/AESCryptor.cs
Mon Sep 30 01:16:39 2013
@@ -29,13 +29,13 @@ namespace org.apache.juddi.v3.client.cry
/// <see cref="AES128"/>
/// <see cref="AES256"/>
/// <author><a href="mailto:[email protected]";>Alex O'Ree</a></author>
- internal abstract class AESCryptor : Cryptor
+ public abstract class AESCryptor : Cryptor
{
protected internal abstract int GetKeySize();
protected internal abstract byte[] GetKey();
protected internal abstract byte[] GetIV();
-
+ protected internal abstract int GetBlockSize();
public string encrypt(string str)
{
@@ -55,7 +55,7 @@ namespace org.apache.juddi.v3.client.cry
}
- internal static byte[] EncryptStringToBytes(string plainText, byte[]
key, byte[] iv)
+ internal byte[] EncryptStringToBytes(string plainText, byte[] key,
byte[] iv)
{
// Check arguments.
if (plainText == null || plainText.Length <= 0)
@@ -71,11 +71,14 @@ namespace org.apache.juddi.v3.client.cry
throw new ArgumentNullException("key");
}
+
byte[] encrypted;
// Create an RijndaelManaged object
// with the specified key and IV.
using (var rijAlg = new RijndaelManaged())
{
+ rijAlg.BlockSize = this.GetBlockSize();
+ rijAlg.KeySize = this.GetKeySize();
rijAlg.Key = key;
rijAlg.IV = iv;
@@ -103,7 +106,7 @@ namespace org.apache.juddi.v3.client.cry
}
- internal static string DecryptStringFromBytes(byte[] cipherText,
byte[] key, byte[] iv)
+ internal string DecryptStringFromBytes(byte[] cipherText, byte[] key,
byte[] iv)
{
// Check arguments.
if (cipherText == null || cipherText.Length <= 0)
@@ -121,6 +124,8 @@ namespace org.apache.juddi.v3.client.cry
// with the specified key and IV.
using (var rijAlg = new RijndaelManaged())
{
+ rijAlg.BlockSize = this.GetBlockSize();
+ rijAlg.KeySize = this.GetKeySize();
rijAlg.Key = key;
rijAlg.IV = iv;
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs?rev=1527428&r1=1527427&r2=1527428&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/CryptorFactory.cs
Mon Sep 30 01:16:39 2013
@@ -30,6 +30,17 @@ namespace org.apache.juddi.v3.client.cry
{
static Dictionary<String, Cryptor> cache = new Dictionary<string,
Cryptor>();
+ public static readonly string AES128 = "AES128Cryptor";
+ public static readonly string AES256 = "AES256Cryptor";
+ public static readonly string TripleDES = "TripleDESCryptor";
+ /// <summary>
+ /// known implementations
+ /// org.apache.juddi.v3.client.crypto.AES128Cryptor
+ /// org.apache.juddi.v3.client.crypto.AES256Cryptor
+ /// org.apache.juddi.v3.client.crypto.TripleDESCryptor
+ /// </summary>
+ /// <param name="clazz"></param>
+ /// <returns></returns>
public static Cryptor getCryptor(string clazz)
{
if (cache.ContainsKey(clazz))
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/DigSigUtil.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/DigSigUtil.cs?rev=1527428&r1=1527427&r2=1527428&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/DigSigUtil.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/DigSigUtil.cs
Mon Sep 30 01:16:39 2013
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
-namespace org.apache.juddi.client.org.apache.juddi.v3.client.crypto
+namespace org.apache.juddi.v3.client.crypto
{
/// <summary>
/// A utility class for signing and verifying JAXB Objects, such as UDDI
entities.
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs?rev=1527428&r1=1527427&r2=1527428&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.crypto/TripleDESCryptor.cs
Mon Sep 30 01:16:39 2013
@@ -27,19 +27,26 @@ namespace org.apache.juddi.v3.client.cry
/// 3DES Ciphers
/// </summary>
/// <author><a href="mailto:[email protected]";>Alex O'Ree</a></author>
- internal sealed class TripleDESCryptor : Cryptor
+ public sealed class TripleDESCryptor : Cryptor
{
+ /**
+ * TripleDESCryptoServiceProvider
+ Legal min key size = 128
+ Legal max key size = 192
+ Legal min block size = 64
+ Legal max block size = 64
+ * */
public string encrypt(string toEncrypt)
{
byte[] toEncryptArray = UTF8Encoding.UTF8.GetBytes(toEncrypt);
// Get the key from config file
-
+ //192 64 s6RDEWiv+mQ= iFGC3Nx1XvUCfDbHTKg8BEPIlJ+oLM7l
TripleDESCryptoServiceProvider tdes = new
TripleDESCryptoServiceProvider();
- tdes.IV = Convert.FromBase64String("/MM3sV9v3dQ=");
- tdes.Key = Convert.FromBase64String("P4KBZkrUbFfXKyuOGVqpGA==");
+ tdes.IV = Convert.FromBase64String("s6RDEWiv+mQ=");
+ tdes.Key =
Convert.FromBase64String("iFGC3Nx1XvUCfDbHTKg8BEPIlJ+oLM7l");
ICryptoTransform cTransform = tdes.CreateEncryptor();
//transform the specified region of bytes array to resultArray
@@ -55,10 +62,10 @@ namespace org.apache.juddi.v3.client.cry
public string decrypt(string str)
{
//get the byte code of the string
- byte[] toEncryptArray = UTF8Encoding.UTF8.GetBytes(str);
+ byte[] toEncryptArray = Convert.FromBase64String(str);
TripleDESCryptoServiceProvider tdes = new
TripleDESCryptoServiceProvider();
- tdes.IV = Convert.FromBase64String("/MM3sV9v3dQ=");
- tdes.Key = Convert.FromBase64String("P4KBZkrUbFfXKyuOGVqpGA==");
+ tdes.IV = Convert.FromBase64String("s6RDEWiv+mQ=");
+ tdes.Key =
Convert.FromBase64String("iFGC3Nx1XvUCfDbHTKg8BEPIlJ+oLM7l");
ICryptoTransform cTransform = tdes.CreateDecryptor();
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs?rev=1527428&r1=1527427&r2=1527428&view=diff
==============================================================================
---
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs
(original)
+++
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/WADL2UDDI.cs
Mon Sep 30 01:16:39 2013
@@ -32,11 +32,11 @@ namespace org.apache.juddi.v3.client.map
{
if (!properties.containsKey("keyDomain"))
{
- throw new ConfigurationException("Property keyDomain is a
required property when using WADL2UDDI.");
+ throw new ConfigurationErrorsException("Property keyDomain
is a required property when using WADL2UDDI.");
}
if (!properties.containsKey("businessKey") &&
!properties.containsKey("businessName"))
{
- throw new ConfigurationException("Either property
businessKey, or businessName, is a required property when using WADL2UDDI.");
+ throw new ConfigurationErrorsException("Either property
businessKey, or businessName, is a required property when using WADL2UDDI.");
}
if (!properties.containsKey("nodeName"))
{
@@ -47,7 +47,7 @@ namespace org.apache.juddi.v3.client.map
}
else
{
- throw new ConfigurationException("Property nodeName is
not defined and is a required property when using WADL2UDDI.");
+ throw new ConfigurationErrorsException("Property
nodeName is not defined and is a required property when using WADL2UDDI.");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
