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/08/31 03:07:51 UTC
svn commit: r1519125 - in /juddi/trunk: juddi-client.net/
juddi-client.net/juddi-client.net-sample/ juddi-client.net/juddi-client.net/
juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/
juddi-client.net/juddi-client.net/org.apache.jud...
Author: alexoree
Date: Sat Aug 31 01:07:50 2013
New Revision: 1519125
URL: http://svn.apache.org/r1519125
Log:
JUDDI-614 closed
Modified:
juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj
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/juddi-client.net.csproj
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs
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/Property.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml
juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml
juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing
juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales
juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml
juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml
juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml
juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml
juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml
juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml
juddi/trunk/juddi-examples/uddi-samples/src/META-INF/simple-publish-uddi.xml
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/WadlImport.java
juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml
juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml
juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml
juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
Modified: juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-sample/juddi-client.net-sample.csproj Sat Aug 31 01:07:50 2013
@@ -38,6 +38,9 @@
<Reference Include="System.Data" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Xml" />
+ <Reference Include="xunit">
+ <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
@@ -56,6 +59,7 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
+ <None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
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=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net-sample/uddi.xml (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net-sample/uddi.xml Sat Aug 31 01:07:50 2013
@@ -10,6 +10,11 @@
<properties>
<property name="serverName" value="uddi-jbossoverlord.rhcloud.com" />
<property name="serverPort" value="80" />
+ <!-- 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}/services/custody-transfer?wsdl</custodyTransferUrl>
@@ -42,8 +47,8 @@
</nodes>
<clerks registerOnStartup="false">
- <clerk name="default" node="default" publisher="root" password="root"/>
- <clerk name="medroot" node="med" publisher="root" password="root"/>
+ <clerk name="default" node="default" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider=""/>
+ <clerk name="medroot" node="med" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider=""/>
<xregister>
<servicebinding bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
</xregister>
@@ -73,5 +78,8 @@
<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.sln
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net.sln?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net.sln (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net.sln Sat Aug 31 01:07:50 2013
@@ -5,6 +5,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "juddi-client.net-sample", "juddi-client.net-sample\juddi-client.net-sample.csproj", "{7FA52B63-F70A-4EC7-8390-CC7C1C9C6B84}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "juddi-client.net.test", "juddi-client.net.test\juddi-client.net.test.csproj", "{0AD62F71-EC84-4133-87FA-C27083F4D884}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{FEB955BD-38E3-4816-94D3-EBF62F4CBB82}"
+ ProjectSection(SolutionItems) = preProject
+ .nuget\packages.config = .nuget\packages.config
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -19,6 +26,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
+ {0AD62F71-EC84-4133-87FA-C27083F4D884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0AD62F71-EC84-4133-87FA-C27083F4D884}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0AD62F71-EC84-4133-87FA-C27083F4D884}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0AD62F71-EC84-4133-87FA-C27083F4D884}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj Sat Aug 31 01:07:50 2013
@@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ClientConfig.cs Sat Aug 31 01:07:50 2013
@@ -364,6 +364,16 @@ namespace org.apache.juddi.v3.client.con
return xServiceBindingRegistrations;
}
+ /**
+ * Used for WADL/WSDL to WSDL
+ * @return
+ */
+ public bool getX_To_Wsdl_Ignore_SSL_Errors()
+ {
+ return this.config.client.XtoWsdl.IgnoreSSLErrors;
+ }
+
+
public HashSet<XRegistration> getXBusinessRegistrations()
{
return xBusinessRegistrations;
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs Sat Aug 31 01:07:50 2013
@@ -30,7 +30,7 @@ namespace org.apache.juddi.v3.client
/// This is the entry point for most functions provide by the juddi-client.
/// </summary>
/// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
- public class UDDIClient
+ public class UDDIClient: IDisposable
{
private static Log log = LogFactory.getLog(typeof(UDDIClient));
@@ -357,5 +357,7 @@ namespace org.apache.juddi.v3.client
}
}
+
+
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client.cs?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/uddi-client.cs Sat Aug 31 01:07:50 2013
@@ -65,6 +65,8 @@ namespace org.apache.juddi.v3.client.con
private uddiClientSubscriptionCallbacks subscriptionCallbacksField;
+ private uddiClientXtoWsdl xtoWsdlField;
+
private string nameField;
/// <remarks/>
@@ -109,6 +111,16 @@ namespace org.apache.juddi.v3.client.con
}
/// <remarks/>
+ public uddiClientXtoWsdl XtoWsdl {
+ get {
+ return this.xtoWsdlField;
+ }
+ set {
+ this.xtoWsdlField = value;
+ }
+ }
+
+ /// <remarks/>
[System.Xml.Serialization.XmlAttributeAttribute()]
public string name {
get {
@@ -1237,4 +1249,25 @@ namespace org.apache.juddi.v3.client.con
}
}
}
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:juddi-apache-org:v3_client")]
+ public partial class uddiClientXtoWsdl {
+
+ private bool ignoreSSLErrorsField;
+
+ /// <remarks/>
+ public bool IgnoreSSLErrors {
+ get {
+ return this.ignoreSSLErrorsField;
+ }
+ set {
+ this.ignoreSSLErrorsField = value;
+ }
+ }
+ }
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/ConsoleLogger.cs Sat Aug 31 01:07:50 2013
@@ -103,5 +103,7 @@ namespace org.apache.juddi.v3.client.log
if (Console.Out != null)
Console.WriteLine(DateTime.Now.ToString("o") + " DEBUG [" + name + "] " + msg.ToString());
}
+
+
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/EventLogger.cs Sat Aug 31 01:07:50 2013
@@ -94,5 +94,10 @@ namespace org.apache.juddi.v3.client.log
if (level.CompareTo(LogLevel.DEBUG) <= 0)
log.WriteEntry(DateTime.Now.ToString("o") + " DEBUG [" + name + "] " + msg.ToString(), EventLogEntryType.Information);
}
+
+ public void Dispose()
+ {
+ this.log.Dispose();
+ }
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/FileLogger.cs Sat Aug 31 01:07:50 2013
@@ -113,5 +113,7 @@ namespace org.apache.juddi.v3.client.log
if (level.CompareTo(LogLevel.DEBUG) <= 0)
WriteEntry(DateTime.Now.ToString("o") + " DEBUG [" + name + "] " + msg.ToString());
}
+
+
}
}
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client/LogFactory.cs Sat Aug 31 01:07:50 2013
@@ -27,7 +27,7 @@ namespace org.apache.juddi.v3.client.log
/// and produces the appropriate logger
/// </summary>
/// <author><a href="mailto:alexoree@apache.org">Alex O'Ree</a></author>
- public class LogFactory
+ public class LogFactory :IDisposable
{
private static LogLevel level = LogLevel.WARN;
private static String target = "CONSOLE";
@@ -105,5 +105,10 @@ namespace org.apache.juddi.v3.client.log
return getLogger(type.Name);
//return new ConsoleLogger(type.Name, level);
}
+
+ public void Dispose()
+ {
+ throw new NotImplementedException();
+ }
}
}
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=1519125&r1=1519124&r2=1519125&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 Sat Aug 31 01:07:50 2013
@@ -315,6 +315,15 @@ public class ClientConfig
public String getConfigurationFile() {
return configurationFile;
}
+
+ /**
+ * Used for WADL/WSDL to WSDL
+ * @return
+ */
+ public boolean isX_To_Wsdl_Ignore_SSL_Errors()
+ {
+ return this.config.getBoolean("client.XtoWsdl.IgnoreSSLErrors", false);
+ }
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java Sat Aug 31 01:07:50 2013
@@ -29,7 +29,7 @@ public class Property
public final static String DEFAULT_UDDI_PROXY_TRANSPORT = "org.uddi.api_v3.client.transport.JAXWSTransport";
- //Properties that can be set in the uddi.xml
+ //Properties that can be set in the uddi.xml under a specific Node element
public static final String LANG = "lang";
public static final String BUSINESS_KEY = "businessKey";
public static final String KEY_DOMAIN = "keyDomain";
@@ -43,6 +43,12 @@ public class Property
public static final String BINDING_CATEGORY_BAG = "bindingCategoryBag";
public static final String BASIC_AUTH_USERNAME = "basicAuthUsername";
public static final String BASIC_AUTH_PASSWORD = "basicAuthPassword";
+ public static final String BASIC_AUTH_PASSWORD_IS_ENC = "basicAuthPasswordIsEncrypted";
+ public static final String BASIC_AUTH_PASSWORD_CP = "basicAuthPasswordCryptoProvider";
+
+ public final static String JUDDI_CRYPTOR_PREFIX = "client.clerks.clerk.";
+ public final static String JUDDI_CRYPTOR_POSTFIX = ".[@isPasswordEncrypted]";
+
//Default Values
public static final String DEFAULT_LANG = "en";
@@ -59,7 +65,6 @@ public class Property
public final static String DEFAULT_CRYPTOR = "org.apache.juddi.v3.client.crypto.DefaultCryptor";
- public final static String JUDDI_CRYPTOR_PREFIX = "client.clerks.clerk.";
- public final static String JUDDI_CRYPTOR_POSTFIX = ".[@isPasswordEncrypted]";
+
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java Sat Aug 31 01:07:50 2013
@@ -402,6 +402,19 @@ public class WADL2UDDI {
return unmarshal;
}
+ /**
+ * Parses a web accessible WADL file
+ * @param weburl
+ * @param username
+ * @param password
+ * @param ignoreSSLErrors if true, SSL errors are ignored
+ * @return a non-null "Application" object, represeting a WADL's application root XML element
+ * Sample code:<br>
+ * <pre>
+ * Application app = WADL2UDDI.ParseWadl(new URL("http://server/wsdl.wsdl"), "username", "password",
+ * clerkManager.getClientConfig().isX_To_Wsdl_Ignore_SSL_Errors() );
+ * </pre>
+ */
public static Application ParseWadl(URL weburl, String username, String password, boolean ignoreSSLErrors){
DefaultHttpClient httpclient = null;
Application unmarshal=null;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java Sat Aug 31 01:07:50 2013
@@ -18,15 +18,21 @@ package org.apache.juddi.v3.client.trans
import java.util.Map;
import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.ws.BindingProvider;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.JUDDIApiService;
import org.apache.juddi.v3.client.UDDIService;
import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
+import org.apache.juddi.v3.client.crypto.CryptorFactory;
+import org.apache.juddi.v3.client.mapping.WADL2UDDI;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.v3_service.UDDICustodyTransferPortType;
import org.uddi.v3_service.UDDIInquiryPortType;
@@ -37,6 +43,7 @@ import org.uddi.v3_service.UDDISubscript
public class JAXWSTransport extends Transport {
+ private static Log logger = LogFactory.getLog(WADL2UDDI.class);
String nodeName = null;
String clientName = null;
@@ -223,20 +230,39 @@ public class JAXWSTransport extends Tran
private void setCredentials(Map<String, Object> requestContext) throws ConfigurationException {
UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
Properties properties = client.getClientConfig().getUDDINode(nodeName).getProperties();
- if (properties!=null) {
- String username = null;
- String password = null;
- if (properties.containsKey(Property.BASIC_AUTH_USERNAME)) {
- username = properties.getProperty(Property.BASIC_AUTH_USERNAME);
- }
- if (properties.containsKey(Property.BASIC_AUTH_PASSWORD)) {
- password = properties.getProperty(Property.BASIC_AUTH_PASSWORD);
- }
- if (username!=null && password!=null) {
- requestContext.put(BindingProvider.USERNAME_PROPERTY, username);
- requestContext.put(BindingProvider.PASSWORD_PROPERTY, password);
- }
- }
+ if (properties!=null) {
+ String username = null;
+ String password = null;
+ if (properties.containsKey(Property.BASIC_AUTH_USERNAME)) {
+ username = properties.getProperty(Property.BASIC_AUTH_USERNAME);
+ }
+ if (properties.containsKey(Property.BASIC_AUTH_PASSWORD)) {
+ password = properties.getProperty(Property.BASIC_AUTH_PASSWORD);
+ }
+ String cipher=null;
+ boolean isEncrypted=false;
+ if (properties.containsKey(Property.BASIC_AUTH_PASSWORD_CP)) {
+ cipher = properties.getProperty(Property.BASIC_AUTH_PASSWORD_CP);
+ }
+ if (properties.containsKey(Property.BASIC_AUTH_PASSWORD_IS_ENC)) {
+ isEncrypted = Boolean.parseBoolean(properties.getProperty(Property.BASIC_AUTH_PASSWORD_IS_ENC));
+ }
+ if (username!=null && password!=null) {
+ requestContext.put(BindingProvider.USERNAME_PROPERTY, username);
+ if (isEncrypted)
+ {
+ try {
+ requestContext.put(BindingProvider.PASSWORD_PROPERTY, CryptorFactory.getCryptor(cipher).decrypt(password));
+ } catch (Exception ex) {
+ logger.error("Unable to decrypt password!", ex);
+ }
+ }
+ else
+ {
+ requestContext.put(BindingProvider.PASSWORD_PROPERTY, password);
+ }
+ }
+ }
}
}
Modified: juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd (original)
+++ juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd Sat Aug 31 01:07:50 2013
@@ -204,7 +204,13 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
+ <xsd:element name="XtoWsdl">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="IgnoreSSLErrors" type="xsd:boolean"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
</xsd:sequence>
<xsd:attribute type="xsd:string" name="name" />
</xsd:complexType>
Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java Sat Aug 31 01:07:50 2013
@@ -130,6 +130,14 @@ public class UDDIClientTest {
}
+
+ @Test
+ public void testReleaseVersion()
+ {
+ String v = Release.getjUDDIClientVersion();
+ //Assert.assertNotSame(v, Release.UNKNOWN);
+ //Apparently maven attaches the version info to the manifest after the tests are ran
+ }
}
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=1519125&r1=1519124&r2=1519125&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 Sat Aug 31 01:07:50 2013
@@ -3,13 +3,18 @@
<reloadDelay>5000</reloadDelay>
<client name="test-client">
<nodes>
- <node isHomeJUDDI="true">
+ <node isHomeJUDDI="true" >
<!-- required 'default' node -->
<name>default</name>
<description>Main jUDDI node</description>
<properties>
<property name="serverName" value="localhost" />
<property name="serverPort" value="8880" />
+ <!-- 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>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
@@ -58,7 +63,7 @@
</node>
</nodes>
- <clerks registerOnStartup="false">
+ <clerks registerOnStartup="false" >
<clerk name="default" node="default" publisher="root" password="root"/>
<clerk name="medroot" node="med" publisher="root" password="root"/>
<xregister>
@@ -90,5 +95,16 @@
<checkTrust>true</checkTrust>
<checkRevocationCRL>true</checkRevocationCRL>
</signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml (original)
+++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml Sat Aug 31 01:07:50 2013
@@ -9,6 +9,11 @@
<properties>
<property name="serverName" value="localhost" />
<property name="serverPort" value="8880" />
+ <!-- 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>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
@@ -36,9 +41,9 @@
<clerks registerOnStartup="false">
<!-- password is password -->
- <clerk name="default" node="default" publisher="root" password="root" />
+ <clerk name="default" node="default" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider="" />
<!-- password is root -->
- <clerk name="medroot" node="med" publisher="root" password="root" />
+ <clerk name="medroot" node="med" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider=""/>
<xregister>
<service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
</xregister>
@@ -68,6 +73,16 @@
<checkTrust>true</checkTrust>
<checkRevocationCRL>true</checkRevocationCRL>
</signature>
-
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml (original)
+++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml Sat Aug 31 01:07:50 2013
@@ -9,6 +9,11 @@
<properties>
<property name="serverName" value="localhost" />
<property name="serverPort" value="8880" />
+ <!-- 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>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
@@ -72,5 +77,16 @@
<checkTrust>true</checkTrust>
<checkRevocationCRL>true</checkRevocationCRL>
</signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml Sat Aug 31 01:07:50 2013
@@ -26,6 +26,11 @@
<property name="serverName" value="localhost"/>
<property name="serverPort" value="8080"/>
<property name="rmiPort" value="1099"/>
+ <!-- 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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
@@ -63,7 +68,7 @@
</node>
</nodes>
<clerks registerOnStartup="false">
- <clerk name="MarketingCratchit" node="default" publisher="marketing" password="marketing"/>
+ <clerk name="MarketingCratchit" node="default" publisher="marketing" password="marketing" isPasswordEncrypted="false" cryptoProvider=""/>
</clerks>
</client>
Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing Sat Aug 31 01:07:50 2013
@@ -27,6 +27,11 @@
<property name="serverName" value="localhost"/>
<property name="serverPort" value="8080"/>
<property name="rmiPort" value="1099"/>
+ <!-- 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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
@@ -57,8 +62,8 @@
</node>
</nodes>
<clerks registerOnStartup="true">
- <clerk name="MarketingCratchit" node="default" publisher="marketing" password="marketing"/>
- <clerk name="SalesCratchit" node="sales" publisher="marketing" password="marketing"/>
+ <clerk name="MarketingCratchit" node="default" publisher="marketing" password="marketing" isPasswordEncrypted="false" cryptoProvider="" />
+ <clerk name="SalesCratchit" node="sales" publisher="marketing" password="marketing" isPasswordEncrypted="false" cryptoProvider=""/>
</clerks>
</client>
Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales Sat Aug 31 01:07:50 2013
@@ -26,6 +26,11 @@
<property name="serverName" value="sales"/>
<property name="serverPort" value="8080"/>
<property name="rmiPort" value="1099"/>
+ <!-- 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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
@@ -56,8 +61,8 @@
</node>
</nodes>
<clerks registerOnStartup="true">
- <clerk name="SalesCratchit" node="default" publisher="sales" password="sales"/>
- <clerk name="MarketingCratchit" node="marketing" publisher="sales" password="sales"/>
+ <clerk name="SalesCratchit" node="default" publisher="sales" password="sales" isPasswordEncrypted="false" cryptoProvider=""/>
+ <clerk name="MarketingCratchit" node="marketing" publisher="sales" password="sales" isPasswordEncrypted="false" cryptoProvider=""/>
</clerks>
</client>
Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml Sat Aug 31 01:07:50 2013
@@ -9,6 +9,11 @@
<description>InVM jUDDI node</description>
<properties>
<property name="serverName" value="localhost" />
+ <!-- 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>
<!-- In VM Transport Settings -->
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
@@ -22,7 +27,43 @@
</node>
</nodes>
<clerks registerOnStartup="false">
- <clerk name="joe" node="default" publisher="joepublisher" password="joepublisher"/>
+ <clerk name="joe" node="default" publisher="joepublisher" password="joepublisher" isPasswordEncrypted="false" cryptoProvider=""/>
</clerks>
+ <signature>
+ <!-- signing stuff -->
+ <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+ <signingKeyStoreType>JKS</signingKeyStoreType>
+ <signingKeyStoreFilePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+ <signingKeyPassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+ <signingKeyAlias>my special key</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>RSA_SHA1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- validation stuff -->
+ <trustStorePath>truststore.jks</trustStorePath>
+ <trustStoreType>JKS</trustStoreType>
+ <trustStorePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>true</checkTrust>
+ <checkRevocationCRL>true</checkRevocationCRL>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml Sat Aug 31 01:07:50 2013
@@ -10,6 +10,11 @@
<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>
<!-- In VM Transport Settings -->
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
@@ -23,10 +28,46 @@
</node>
</nodes>
<clerks registerOnStartup="false">
- <clerk name="joe" node="default" publisher="joepublisher" password="joepublisher">
+ <clerk name="joe" node="default" publisher="joepublisher" password="joepublisher" isPasswordEncrypted="false" cryptoProvider="">
<wsdl businessKey="uddi:uddi.joepublisher.com:businessone">wsdl/sample.wsdl</wsdl>
</clerk>
</clerks>
+ <signature>
+ <!-- signing stuff -->
+ <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+ <signingKeyStoreType>JKS</signingKeyStoreType>
+ <signingKeyStoreFilePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+ <signingKeyPassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+ <signingKeyAlias>my special key</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>RSA_SHA1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- validation stuff -->
+ <trustStorePath>truststore.jks</trustStorePath>
+ <trustStoreType>JKS</trustStoreType>
+ <trustStorePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>true</checkTrust>
+ <checkRevocationCRL>true</checkRevocationCRL>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml (original)
+++ juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml Sat Aug 31 01:07:50 2013
@@ -9,6 +9,11 @@
<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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
Modified: juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml (original)
+++ juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml Sat Aug 31 01:07:50 2013
@@ -9,6 +9,11 @@
<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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
@@ -22,5 +27,41 @@
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
</node>
</nodes>
+ <signature>
+ <!-- signing stuff -->
+ <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+ <signingKeyStoreType>JKS</signingKeyStoreType>
+ <signingKeyStoreFilePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+ <signingKeyPassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+ <signingKeyAlias>my special key</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>RSA_SHA1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- validation stuff -->
+ <trustStorePath>truststore.jks</trustStorePath>
+ <trustStoreType>JKS</trustStoreType>
+ <trustStorePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>true</checkTrust>
+ <checkRevocationCRL>true</checkRevocationCRL>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
Modified: juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml (original)
+++ juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml Sat Aug 31 01:07:50 2013
@@ -9,6 +9,11 @@
<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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
@@ -22,6 +27,41 @@
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
</node>
</nodes>
-
+ <signature>
+ <!-- signing stuff -->
+ <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+ <signingKeyStoreType>JKS</signingKeyStoreType>
+ <signingKeyStoreFilePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+ <signingKeyPassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+ <signingKeyAlias>my special key</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>RSA_SHA1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- validation stuff -->
+ <trustStorePath>truststore.jks</trustStorePath>
+ <trustStoreType>JKS</trustStoreType>
+ <trustStorePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>true</checkTrust>
+ <checkRevocationCRL>true</checkRevocationCRL>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
Modified: juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml (original)
+++ juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml Sat Aug 31 01:07:50 2013
@@ -10,6 +10,11 @@
<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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml (original)
+++ juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml Sat Aug 31 01:07:50 2013
@@ -11,6 +11,11 @@
<property name="serverPort" value="8080"/>
<property name="keyDomain" value="sales.apache.org"/>
<property name="department" value="sales" />
+ <!-- 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.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
@@ -23,11 +28,47 @@
</node>
</nodes>
<clerks registerOnStartup="true">
- <clerk name="BobCratchit" node="default" publisher="sales" password="sales">
+ <clerk name="BobCratchit" node="default" publisher="sales" password="sales" isPasswordEncrypted="false" cryptoProvider="">
<wsdl></wsdl>
<class>org.apache.juddi.example.HelloWorldImpl</class>
</clerk>
</clerks>
+ <signature>
+ <!-- signing stuff -->
+ <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+ <signingKeyStoreType>JKS</signingKeyStoreType>
+ <signingKeyStoreFilePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+ <signingKeyPassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+ <signingKeyAlias>my special key</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>RSA_SHA1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- validation stuff -->
+ <trustStorePath>truststore.jks</trustStorePath>
+ <trustStoreType>JKS</trustStoreType>
+ <trustStorePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>true</checkTrust>
+ <checkRevocationCRL>true</checkRevocationCRL>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml (original)
+++ juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml Sat Aug 31 01:07:50 2013
@@ -11,6 +11,11 @@
<property name="serverPort" value="8080"/>
<property name="keyDomain" value="juddi.apache.org"/>
<property name="department" value="businesses" />
+ <!-- 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.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
@@ -23,10 +28,46 @@
</node>
</nodes>
<clerks registerOnStartup="true">
- <clerk name="ROOTClerk" node="default" publisher="root" password="root">
+ <clerk name="ROOTClerk" node="default" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider="">
<class>org.apache.juddi.example.HelloWorldImpl</class>
</clerk>
</clerks>
+ <signature>
+ <!-- signing stuff -->
+ <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+ <signingKeyStoreType>JKS</signingKeyStoreType>
+ <signingKeyStoreFilePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+ <signingKeyPassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+ <signingKeyAlias>my special key</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>RSA_SHA1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- validation stuff -->
+ <trustStorePath>truststore.jks</trustStorePath>
+ <trustStoreType>JKS</trustStoreType>
+ <trustStorePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>true</checkTrust>
+ <checkRevocationCRL>true</checkRevocationCRL>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
\ No newline at end of file
Modified: juddi/trunk/juddi-examples/uddi-samples/src/META-INF/simple-publish-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-samples/src/META-INF/simple-publish-uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-samples/src/META-INF/simple-publish-uddi.xml (original)
+++ juddi/trunk/juddi-examples/uddi-samples/src/META-INF/simple-publish-uddi.xml Sat Aug 31 01:07:50 2013
@@ -10,6 +10,11 @@
<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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
Modified: juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/WadlImport.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/WadlImport.java?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/WadlImport.java (original)
+++ juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/WadlImport.java Sat Aug 31 01:07:50 2013
@@ -99,6 +99,9 @@ public class WadlImport {
//in either case, we're going to have to parse the WSDL
+
+ //Application app = WADL2UDDI.ParseWadl(new URL("http://server/wsdl.wsdl"), "username", "password", clerkManager.getClientConfig().isX_To_Wsdl_Ignore_SSL_Errors() );
+
Application app = WADL2UDDI.ParseWadl(new File("diggo.wadl"));
List<URL> urls = WADL2UDDI.GetBaseAddresses(app);
URL url = urls.get(0);
Modified: juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml (original)
+++ juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml Sat Aug 31 01:07:50 2013
@@ -9,6 +9,11 @@
<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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
@@ -23,7 +28,7 @@
</node>
</nodes>
<clerks registerOnStartup="true">
- <clerk name="joe" node="default" publisher="joepublisher" password="joepublisher">
+ <clerk name="joe" node="default" publisher="joepublisher" password="joepublisher" isPasswordEncrypted="false" cryptoProvider="">
<wsdl businessKey="uddi:uddi.joepublisher.com:business-for-wsdl">wsdl/helloworld.wsdl</wsdl>
</clerk>
</clerks>
Modified: juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml (original)
+++ juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml Sat Aug 31 01:07:50 2013
@@ -10,6 +10,11 @@
<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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
@@ -24,7 +29,7 @@
</node>
</nodes>
<clerks registerOnStartup="false">
- <clerk name="joe" node="default" publisher="joepublisher" password="joepublisher">
+ <clerk name="joe" node="default" publisher="joepublisher" password="joepublisher" isPasswordEncrypted="false" cryptoProvider="">
<wsdl businessKey="uddi:uddi.joepublisher.com:business-for-wsdl">wsdl/helloworld.wsdl</wsdl>
</clerk>
</clerks>
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Sat Aug 31 01:07:50 2013
@@ -1367,11 +1367,9 @@ public class UddiHub {
fb.setAuthInfo(GetToken());
if (fq != null) {
fb.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
- if (fq != null) {
for (int i = 0; i < fq.length; i++) {
fb.getFindQualifiers().getFindQualifier().add(fq[i]);
}
- }
}
BindingDetail findBusiness = null;
switch (criteria) {
@@ -1422,11 +1420,11 @@ public class UddiHub {
append(StringEscapeUtils.escapeHtml(findBusiness.getBindingTemplate().get(i).getServiceKey())).
append("\">");
if (findBusiness.getBindingTemplate().get(i).getDescription().isEmpty()) {
- sb.append(StringEscapeUtils.escapeHtml(findBusiness.getBindingTemplate().get(i).getServiceKey()));
+ sb.append(StringEscapeUtils.escapeHtml(findBusiness.getBindingTemplate().get(i).getBindingKey()));
} else {
String t = StringEscapeUtils.escapeHtml(Printers.ListToDescString(findBusiness.getBindingTemplate().get(i).getDescription()));
if (t == null || t.trim().length() == 0) {
- sb.append(StringEscapeUtils.escapeHtml(findBusiness.getBindingTemplate().get(i).getServiceKey()));
+ sb.append(StringEscapeUtils.escapeHtml(findBusiness.getBindingTemplate().get(i).getBindingKey()));
} else {
sb.append(t);
}
Modified: juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml Sat Aug 31 01:07:50 2013
@@ -10,6 +10,11 @@
<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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
@@ -23,5 +28,41 @@
<juddiApiUrl>http://localhost:8080/juddiv3/services/juddi-api</juddiApiUrl>
</node>
</nodes>
+ <signature>
+ <!-- signing stuff -->
+ <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+ <signingKeyStoreType>JKS</signingKeyStoreType>
+ <signingKeyStoreFilePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+ <signingKeyPassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+ <signingKeyAlias>my special key</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>RSA_SHA1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- validation stuff -->
+ <trustStorePath>truststore.jks</trustStorePath>
+ <trustStoreType>JKS</trustStoreType>
+ <trustStorePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>true</checkTrust>
+ <checkRevocationCRL>true</checkRevocationCRL>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
Modified: juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml Sat Aug 31 01:07:50 2013
@@ -10,6 +10,11 @@
<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>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
@@ -23,5 +28,41 @@
<juddiApiUrl>http://localhost:8080/juddiv3/services/juddi-api</juddiApiUrl>
</node>
</nodes>
+ <signature>
+ <!-- signing stuff -->
+ <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+ <signingKeyStoreType>JKS</signingKeyStoreType>
+ <signingKeyStoreFilePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+ <signingKeyPassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+ <signingKeyAlias>my special key</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>RSA_SHA1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- validation stuff -->
+ <trustStorePath>truststore.jks</trustStorePath>
+ <trustStoreType>JKS</trustStoreType>
+ <trustStorePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>true</checkTrust>
+ <checkRevocationCRL>true</checkRevocationCRL>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
Modified: juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml (original)
+++ juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml Sat Aug 31 01:07:50 2013
@@ -26,6 +26,11 @@
<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>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
@@ -75,8 +80,8 @@
</nodes>
<clerks registerOnStartup="false">
- <clerk name="default" node="default" publisher="root" password="root"/>
- <clerk name="medroot" node="med" publisher="root" password="root"/>
+ <clerk name="default" node="default" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider=""/>
+ <clerk name="medroot" node="med" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider=""/>
<xregister>
<service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
</xregister>
Modified: juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml?rev=1519125&r1=1519124&r2=1519125&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml Sat Aug 31 01:07:50 2013
@@ -11,6 +11,11 @@
<properties>
<property name="serverName" value="localhost" />
<property name="serverPort" value="8880" />
+ <!-- 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>
<!-- systinet
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
@@ -77,13 +82,48 @@
</nodes>
<clerks registerOnStartup="false">
- <clerk name="default" node="default" publisher="root" password="root" />
- <clerk name="medroot" node="med" publisher="root" password="root"/>
+ <clerk name="default" node="default" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider=""/>
+ <clerk name="medroot" node="med" publisher="root" password="root" isPasswordEncrypted="false" cryptoProvider=""/>
<xregister>
<service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
</xregister>
<subscription subscriptionKey=" " clerk="medroot" />
</clerks>
-
+ <signature>
+ <!-- signing stuff -->
+ <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+ <signingKeyStoreType>JKS</signingKeyStoreType>
+ <signingKeyStoreFilePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+ <signingKeyPassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+ <signingKeyAlias>my special key</signingKeyAlias>
+ <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+ <signatureMethod>RSA_SHA1</signatureMethod>
+ <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+ <!-- validation stuff -->
+ <trustStorePath>truststore.jks</trustStorePath>
+ <trustStoreType>JKS</trustStoreType>
+ <trustStorePassword
+ isPasswordEncrypted="false"
+ cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+
+ <checkTimestamps>true</checkTimestamps>
+ <checkTrust>true</checkTrust>
+ <checkRevocationCRL>true</checkRevocationCRL>
+ </signature>
+ <subscriptionCallbacks>
+ <keyDomain>uddi:somebusiness</keyDomain>
+ <listenUrl>http://MyHostname:4444/callback</listenUrl>
+ <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+ <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+ <signatureBehavior>DoNothing</signatureBehavior>
+ <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+ </subscriptionCallbacks>
+ <XtoWsdl>
+ <IgnoreSSLErrors>false</IgnoreSSLErrors>
+ </XtoWsdl>
</client>
</uddi>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org