You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/01/16 03:59:34 UTC
svn commit: r1558676 [1/2] - in /juddi/trunk: docs/db/ddl/
juddi-client.net/juddi-client.net/bindings/
juddi-core/src/main/java/org/apache/juddi/mapping/
juddi-core/src/main/java/org/apache/juddi/model/
juddi-core/src/main/java/org/apache/juddi/rmi/ ju...
Author: alexoree
Date: Thu Jan 16 02:59:33 2014
New Revision: 1558676
URL: http://svn.apache.org/r1558676
Log:
JUDDI-792 this issue snow balled into a number of changes. xsd schema fix from string to boolean for IsEnabled and IsAdmin for juddi api ws, serialization fix to resolve .net issues with getAllPublisherDetail and the fix for this specific problem
Modified:
juddi/trunk/docs/db/ddl/db2.ddl
juddi/trunk/docs/db/ddl/derby.ddl
juddi/trunk/docs/db/ddl/mysql.ddl
juddi/trunk/docs/db/ddl/mysql5.ddl
juddi/trunk/docs/db/ddl/mysql5InnoDB.ddl
juddi/trunk/docs/db/ddl/oracle9.ddl
juddi/trunk/docs/db/ddl/postgres.ddl
juddi/trunk/docs/db/ddl/sqlserver.ddl
juddi/trunk/docs/db/ddl/sybase.ddl
juddi/trunk/juddi-client.net/juddi-client.net/bindings/JUDDIApiService.cs
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java
juddi/trunk/juddi-gui/src/main/webapp/header-bottom.jsp
juddi/trunk/juddi-gui/src/main/webapp/user/warningbanner.jsp
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java
juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/header-bottom.jsp
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java
juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
juddi/trunk/uddi-ws/src/main/resources/juddi_api_v1.wsdl
Modified: juddi/trunk/docs/db/ddl/db2.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/db2.ddl?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/db2.ddl (original)
+++ juddi/trunk/docs/db/ddl/db2.ddl Thu Jan 16 02:59:33 2014
@@ -271,8 +271,8 @@
create table j3_publisher (
authorized_name varchar(255) not null,
email_address varchar(255),
- is_admin varchar(5),
- is_enabled varchar(5),
+ is_admin bool,
+ is_enabled bool,
max_bindings_per_service integer,
max_businesses integer,
max_services_per_business integer,
Modified: juddi/trunk/docs/db/ddl/derby.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/derby.ddl?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/derby.ddl (original)
+++ juddi/trunk/docs/db/ddl/derby.ddl Thu Jan 16 02:59:33 2014
@@ -271,8 +271,8 @@
create table j3_publisher (
authorized_name varchar(255) not null,
email_address varchar(255),
- is_admin varchar(5),
- is_enabled varchar(5),
+ is_admin bool,
+ is_enabled bool,
max_bindings_per_service integer,
max_businesses integer,
max_services_per_business integer,
Modified: juddi/trunk/docs/db/ddl/mysql.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/mysql.ddl?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/mysql.ddl (original)
+++ juddi/trunk/docs/db/ddl/mysql.ddl Thu Jan 16 02:59:33 2014
@@ -271,8 +271,8 @@
create table j3_publisher (
authorized_name varchar(255) not null,
email_address varchar(255),
- is_admin varchar(5),
- is_enabled varchar(5),
+ is_admin bool,
+ is_enabled bool,
max_bindings_per_service integer,
max_businesses integer,
max_services_per_business integer,
Modified: juddi/trunk/docs/db/ddl/mysql5.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/mysql5.ddl?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/mysql5.ddl (original)
+++ juddi/trunk/docs/db/ddl/mysql5.ddl Thu Jan 16 02:59:33 2014
@@ -271,8 +271,8 @@
create table j3_publisher (
authorized_name varchar(255) not null,
email_address varchar(255),
- is_admin varchar(5),
- is_enabled varchar(5),
+ is_admin bool,
+ is_enabled bool,
max_bindings_per_service integer,
max_businesses integer,
max_services_per_business integer,
Modified: juddi/trunk/docs/db/ddl/mysql5InnoDB.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/mysql5InnoDB.ddl?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/mysql5InnoDB.ddl (original)
+++ juddi/trunk/docs/db/ddl/mysql5InnoDB.ddl Thu Jan 16 02:59:33 2014
@@ -271,8 +271,8 @@
create table j3_publisher (
authorized_name varchar(255) not null,
email_address varchar(255),
- is_admin varchar(5),
- is_enabled varchar(5),
+ is_admin bool,
+ is_enabled bool,
max_bindings_per_service integer,
max_businesses integer,
max_services_per_business integer,
Modified: juddi/trunk/docs/db/ddl/oracle9.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/oracle9.ddl?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/oracle9.ddl (original)
+++ juddi/trunk/docs/db/ddl/oracle9.ddl Thu Jan 16 02:59:33 2014
@@ -271,8 +271,8 @@
create table j3_publisher (
authorized_name varchar2(255 char) not null,
email_address varchar2(255 char),
- is_admin varchar2(5 char),
- is_enabled varchar2(5 char),
+ is_admin bool,
+ is_enabled bool,
max_bindings_per_service number(10,0),
max_businesses number(10,0),
max_services_per_business number(10,0),
Modified: juddi/trunk/docs/db/ddl/postgres.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/postgres.ddl?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/postgres.ddl (original)
+++ juddi/trunk/docs/db/ddl/postgres.ddl Thu Jan 16 02:59:33 2014
@@ -271,8 +271,8 @@
create table j3_publisher (
authorized_name varchar(255) not null,
email_address varchar(255),
- is_admin varchar(5),
- is_enabled varchar(5),
+ is_admin bool,
+ is_enabled bool,
max_bindings_per_service int4,
max_businesses int4,
max_services_per_business int4,
Modified: juddi/trunk/docs/db/ddl/sqlserver.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/sqlserver.ddl?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/sqlserver.ddl (original)
+++ juddi/trunk/docs/db/ddl/sqlserver.ddl Thu Jan 16 02:59:33 2014
@@ -271,8 +271,8 @@
create table j3_publisher (
authorized_name varchar(255) not null,
email_address varchar(255) null,
- is_admin varchar(5) null,
- is_enabled varchar(5) null,
+ is_admin bool null,
+ is_enabled bool null,
max_bindings_per_service int null,
max_businesses int null,
max_services_per_business int null,
Modified: juddi/trunk/docs/db/ddl/sybase.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/sybase.ddl?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/sybase.ddl (original)
+++ juddi/trunk/docs/db/ddl/sybase.ddl Thu Jan 16 02:59:33 2014
@@ -271,8 +271,8 @@
create table j3_publisher (
authorized_name varchar(255) not null,
email_address varchar(255) null,
- is_admin varchar(5) null,
- is_enabled varchar(5) null,
+ is_admin bool null,
+ is_enabled bool null,
max_bindings_per_service int null,
max_businesses int null,
max_services_per_business int null,
Modified: juddi/trunk/juddi-client.net/juddi-client.net/bindings/JUDDIApiService.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/bindings/JUDDIApiService.cs?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/bindings/JUDDIApiService.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/bindings/JUDDIApiService.cs Thu Jan 16 02:59:33 2014
@@ -40,12 +40,12 @@ namespace org.apache.juddi.apiv3
private System.Threading.SendOrPostCallback delete_publisherOperationCompleted;
- private System.Threading.SendOrPostCallback adminDelete_tModelOperationCompleted;
-
private System.Threading.SendOrPostCallback save_publisherOperationCompleted;
private System.Threading.SendOrPostCallback save_NodeOperationCompleted;
+ private System.Threading.SendOrPostCallback adminDelete_tModelOperationCompleted;
+
private System.Threading.SendOrPostCallback save_ClientSubscriptionInfoOperationCompleted;
private System.Threading.SendOrPostCallback invoke_SyncSubscriptionOperationCompleted;
@@ -53,7 +53,7 @@ namespace org.apache.juddi.apiv3
/// <remarks/>
public JUDDIApiService()
{
- this.Url = "http://localhost:8080/juddiv3/services/juddi-api";
+ this.Url = "http://localhost/juddiv3/services/juddi-api";
}
/// <remarks/>
@@ -72,22 +72,22 @@ namespace org.apache.juddi.apiv3
public event delete_publisherCompletedEventHandler delete_publisherCompleted;
/// <remarks/>
- public event adminDelete_tModelCompletedEventHandler adminDelete_tModelCompleted;
-
- /// <remarks/>
public event save_publisherCompletedEventHandler save_publisherCompleted;
/// <remarks/>
public event save_NodeCompletedEventHandler save_NodeCompleted;
/// <remarks/>
+ public event adminDelete_tModelCompletedEventHandler adminDelete_tModelCompleted;
+
+ /// <remarks/>
public event save_ClientSubscriptionInfoCompletedEventHandler save_ClientSubscriptionInfoCompleted;
/// <remarks/>
public event invoke_SyncSubscriptionCompletedEventHandler invoke_SyncSubscriptionCompleted;
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("get_publisherDetail", RequestNamespace = "urn:juddi-apache-org:api_v3", ResponseElementName = "publisherDetail", ResponseNamespace = "urn:juddi-apache-org:api_v3", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("get_publisherDetail", RequestNamespace = "urn:juddi-apache-org:api_v3", ResponseElementName = "publisherDetailResponse", ResponseNamespace = "urn:juddi-apache-org:api_v3", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
[return: System.Xml.Serialization.XmlElementAttribute("publisher", IsNullable = true)]
public publisher[] get_publisherDetail(string authInfo, [System.Xml.Serialization.XmlElementAttribute("publisherId")] string[] publisherId, [System.Xml.Serialization.XmlAttributeAttribute()] out bool truncated, [System.Xml.Serialization.XmlAttributeAttribute()] [System.Xml.Serialization.XmlIgnoreAttribute()] out bool truncatedSpecified)
{
@@ -145,7 +145,7 @@ namespace org.apache.juddi.apiv3
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("delete_ClientSubscriptionInfo", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
- public void delete_ClientSubscriptionInfo([System.Xml.Serialization.XmlElementAttribute("delete_ClientSubscriptionInfo", Namespace = "urn:juddi-apache-org:api_v3")] delete_clientSubscriptionInfo delete_ClientSubscriptionInfo1)
+ public void delete_ClientSubscriptionInfo([System.Xml.Serialization.XmlElementAttribute("delete_ClientSubscriptionInfo", Namespace = "urn:juddi-apache-org:api_v3", IsNullable = true)] delete_clientSubscriptionInfo delete_ClientSubscriptionInfo1)
{
this.Invoke("delete_ClientSubscriptionInfo", new object[] {
delete_ClientSubscriptionInfo1});
@@ -192,7 +192,7 @@ namespace org.apache.juddi.apiv3
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("save_Clerk", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
- [return: System.Xml.Serialization.XmlArrayAttribute("save_ClerkResponse", Namespace = "urn:juddi-apache-org:api_v3")]
+ [return: System.Xml.Serialization.XmlArrayAttribute("save_ClerkResponse", Namespace = "urn:juddi-apache-org:api_v3", IsNullable = true)]
public clerk[] save_Clerk([System.Xml.Serialization.XmlElementAttribute(Namespace = "urn:juddi-apache-org:api_v3")] save_clerk save_ClerkRequest)
{
object[] results = this.Invoke("save_Clerk", new object[] {
@@ -239,15 +239,15 @@ namespace org.apache.juddi.apiv3
this.save_ClerkCompleted(this, new save_ClerkCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
-/*
+
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("get_allPublisherDetail", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
[return: System.Xml.Serialization.XmlElementAttribute("publisherDetail", Namespace = "urn:juddi-apache-org:api_v3")]
- public object[] get_allPublisherDetail([System.Xml.Serialization.XmlElementAttribute("get_allPublisherDetail", Namespace = "urn:juddi-apache-org:api_v3")] get_allPublisherDetail get_allPublisherDetail1)
+ public publisherDetail get_allPublisherDetail([System.Xml.Serialization.XmlElementAttribute("get_allPublisherDetail", Namespace = "urn:juddi-apache-org:api_v3")] get_allPublisherDetail get_allPublisherDetail1)
{
object[] results = this.Invoke("get_allPublisherDetail", new object[] {
get_allPublisherDetail1});
- return ((object[])(results[0]));
+ return ((publisherDetail)(results[0]));
}
/// <remarks/>
@@ -258,10 +258,10 @@ namespace org.apache.juddi.apiv3
}
/// <remarks/>
- public object[] Endget_allPublisherDetail(System.IAsyncResult asyncResult)
+ public publisherDetail Endget_allPublisherDetail(System.IAsyncResult asyncResult)
{
object[] results = this.EndInvoke(asyncResult);
- return ((object[])(results[0]));
+ return ((publisherDetail)(results[0]));
}
/// <remarks/>
@@ -289,7 +289,7 @@ namespace org.apache.juddi.apiv3
this.get_allPublisherDetailCompleted(this, new get_allPublisherDetailCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
- */
+
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("delete_publisher", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
public void delete_publisher([System.Xml.Serialization.XmlElementAttribute("delete_publisher", Namespace = "urn:juddi-apache-org:api_v3")] delete_publisher delete_publisher1)
@@ -338,55 +338,8 @@ namespace org.apache.juddi.apiv3
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("adminDelete_tmodel", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
- public void adminDelete_tModel([System.Xml.Serialization.XmlElementAttribute("adminDelete_tmodel", Namespace = "urn:juddi-apache-org:api_v3")] delete_tModel adminDelete_tmodel1)
- {
- this.Invoke("adminDelete_tModel", new object[] {
- adminDelete_tmodel1});
- }
-
- /// <remarks/>
- public System.IAsyncResult BeginadminDelete_tModel(delete_tModel adminDelete_tmodel1, System.AsyncCallback callback, object asyncState)
- {
- return this.BeginInvoke("adminDelete_tModel", new object[] {
- adminDelete_tmodel1}, callback, asyncState);
- }
-
- /// <remarks/>
- public void EndadminDelete_tModel(System.IAsyncResult asyncResult)
- {
- this.EndInvoke(asyncResult);
- }
-
- /// <remarks/>
- public void adminDelete_tModelAsync(delete_tModel adminDelete_tmodel1)
- {
- this.adminDelete_tModelAsync(adminDelete_tmodel1, null);
- }
-
- /// <remarks/>
- public void adminDelete_tModelAsync(delete_tModel adminDelete_tmodel1, object userState)
- {
- if ((this.adminDelete_tModelOperationCompleted == null))
- {
- this.adminDelete_tModelOperationCompleted = new System.Threading.SendOrPostCallback(this.OnadminDelete_tModelOperationCompleted);
- }
- this.InvokeAsync("adminDelete_tModel", new object[] {
- adminDelete_tmodel1}, this.adminDelete_tModelOperationCompleted, userState);
- }
-
- private void OnadminDelete_tModelOperationCompleted(object arg)
- {
- if ((this.adminDelete_tModelCompleted != null))
- {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.adminDelete_tModelCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("save_publisher", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
- [return: System.Xml.Serialization.XmlElementAttribute("save_publisherResponse", Namespace = "urn:juddi-apache-org:api_v3")]
+ [return: System.Xml.Serialization.XmlElementAttribute("save_publisherResponse", Namespace = "urn:juddi-apache-org:api_v3", IsNullable = true)]
public publisherDetail save_publisher([System.Xml.Serialization.XmlElementAttribute("save_publisher", Namespace = "urn:juddi-apache-org:api_v3")] save_publisher save_publisher1)
{
object[] results = this.Invoke("save_publisher", new object[] {
@@ -436,7 +389,7 @@ namespace org.apache.juddi.apiv3
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("save_Node", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
- [return: System.Xml.Serialization.XmlArrayAttribute("save_NodeResponse", Namespace = "urn:juddi-apache-org:api_v3")]
+ [return: System.Xml.Serialization.XmlArrayAttribute("save_NodeResponse", Namespace = "urn:juddi-apache-org:api_v3", IsNullable = true)]
public node[] save_Node([System.Xml.Serialization.XmlElementAttribute(Namespace = "urn:juddi-apache-org:api_v3")] save_node save_NodeRequest)
{
object[] results = this.Invoke("save_Node", new object[] {
@@ -485,9 +438,56 @@ namespace org.apache.juddi.apiv3
}
/// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("adminDelete_tmodel", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
+ public void adminDelete_tModel([System.Xml.Serialization.XmlElementAttribute("adminDelete_tmodel", Namespace = "urn:juddi-apache-org:api_v3", IsNullable = true)] delete_tModel adminDelete_tmodel1)
+ {
+ this.Invoke("adminDelete_tModel", new object[] {
+ adminDelete_tmodel1});
+ }
+
+ /// <remarks/>
+ public System.IAsyncResult BeginadminDelete_tModel(delete_tModel adminDelete_tmodel1, System.AsyncCallback callback, object asyncState)
+ {
+ return this.BeginInvoke("adminDelete_tModel", new object[] {
+ adminDelete_tmodel1}, callback, asyncState);
+ }
+
+ /// <remarks/>
+ public void EndadminDelete_tModel(System.IAsyncResult asyncResult)
+ {
+ this.EndInvoke(asyncResult);
+ }
+
+ /// <remarks/>
+ public void adminDelete_tModelAsync(delete_tModel adminDelete_tmodel1)
+ {
+ this.adminDelete_tModelAsync(adminDelete_tmodel1, null);
+ }
+
+ /// <remarks/>
+ public void adminDelete_tModelAsync(delete_tModel adminDelete_tmodel1, object userState)
+ {
+ if ((this.adminDelete_tModelOperationCompleted == null))
+ {
+ this.adminDelete_tModelOperationCompleted = new System.Threading.SendOrPostCallback(this.OnadminDelete_tModelOperationCompleted);
+ }
+ this.InvokeAsync("adminDelete_tModel", new object[] {
+ adminDelete_tmodel1}, this.adminDelete_tModelOperationCompleted, userState);
+ }
+
+ private void OnadminDelete_tModelOperationCompleted(object arg)
+ {
+ if ((this.adminDelete_tModelCompleted != null))
+ {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.adminDelete_tModelCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("save_ClientSubscriptionInfo", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
- [return: System.Xml.Serialization.XmlArrayAttribute("save_ClientSubscriptionInfoResponse", Namespace = "urn:juddi-apache-org:api_v3")]
- public clientSubscriptionInfo[] save_ClientSubscriptionInfo([System.Xml.Serialization.XmlElementAttribute(Namespace = "urn:juddi-apache-org:api_v3")] save_clientSubscriptionInfo save_ClientSubscriptionInfoRequest)
+ [return: System.Xml.Serialization.XmlArrayAttribute("save_ClientSubscriptionInfoResponse", Namespace = "urn:juddi-apache-org:api_v3", IsNullable = true)]
+ public clientSubscriptionInfo[] save_ClientSubscriptionInfo([System.Xml.Serialization.XmlElementAttribute(Namespace = "urn:juddi-apache-org:api_v3", IsNullable = true)] save_clientSubscriptionInfo save_ClientSubscriptionInfoRequest)
{
object[] results = this.Invoke("save_ClientSubscriptionInfo", new object[] {
save_ClientSubscriptionInfoRequest});
@@ -536,8 +536,8 @@ namespace org.apache.juddi.apiv3
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("invoke_SyncSubscription", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
- [return: System.Xml.Serialization.XmlElementAttribute("invoke_SyncSubscriptionResponse", Namespace = "urn:juddi-apache-org:api_v3")]
- public syncSubscriptionDetailResponse invoke_SyncSubscription([System.Xml.Serialization.XmlElementAttribute("invoke_SyncSubscription", Namespace = "urn:juddi-apache-org:api_v3")] syncSubscriptionRequest invoke_SyncSubscription1)
+ [return: System.Xml.Serialization.XmlElementAttribute("invoke_SyncSubscriptionResponse", Namespace = "urn:juddi-apache-org:api_v3", IsNullable = true)]
+ public syncSubscriptionDetailResponse invoke_SyncSubscription([System.Xml.Serialization.XmlElementAttribute("invoke_SyncSubscription", Namespace = "urn:juddi-apache-org:api_v3", IsNullable = true)] syncSubscriptionRequest invoke_SyncSubscription1)
{
object[] results = this.Invoke("invoke_SyncSubscription", new object[] {
invoke_SyncSubscription1});
@@ -604,9 +604,13 @@ namespace org.apache.juddi.apiv3
private string emailAddressField;
- private string isAdminField;
+ private bool isAdminField;
- private string isEnabledField;
+ private bool isAdminFieldSpecified;
+
+ private bool isEnabledField;
+
+ private bool isEnabledFieldSpecified;
private int maxBindingsPerServiceField;
@@ -655,7 +659,7 @@ namespace org.apache.juddi.apiv3
}
/// <remarks/>
- public string isAdmin
+ public bool isAdmin
{
get
{
@@ -668,7 +672,21 @@ namespace org.apache.juddi.apiv3
}
/// <remarks/>
- public string isEnabled
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool isAdminSpecified
+ {
+ get
+ {
+ return this.isAdminFieldSpecified;
+ }
+ set
+ {
+ this.isAdminFieldSpecified = value;
+ }
+ }
+
+ /// <remarks/>
+ public bool isEnabled
{
get
{
@@ -681,6 +699,20 @@ namespace org.apache.juddi.apiv3
}
/// <remarks/>
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool isEnabledSpecified
+ {
+ get
+ {
+ return this.isEnabledFieldSpecified;
+ }
+ set
+ {
+ this.isEnabledFieldSpecified = value;
+ }
+ }
+
+ /// <remarks/>
public int maxBindingsPerService
{
get
@@ -819,10 +851,6 @@ namespace org.apache.juddi.apiv3
-
-
-
-
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
[System.SerializableAttribute()]
@@ -849,7 +877,8 @@ namespace org.apache.juddi.apiv3
}
}
-
+
+
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
[System.SerializableAttribute()]
@@ -1426,54 +1455,37 @@ namespace org.apache.juddi.apiv3
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace = "urn:juddi-apache-org:api_v3")]
- public partial class publisherDetail
+ public partial class save_publisher
{
- private publisher[] publisherField;
-
- private bool truncatedField;
-
- private bool truncatedFieldSpecified;
+ private string authInfoField;
- /// <remarks/>
- [System.Xml.Serialization.XmlElementAttribute("publisher", IsNullable = true)]
- public publisher[] publisher
- {
- get
- {
- return this.publisherField;
- }
- set
- {
- this.publisherField = value;
- }
- }
+ private publisher[] publisherField;
/// <remarks/>
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public bool truncated
+ public string authInfo
{
get
{
- return this.truncatedField;
+ return this.authInfoField;
}
set
{
- this.truncatedField = value;
+ this.authInfoField = value;
}
}
/// <remarks/>
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool truncatedSpecified
+ [System.Xml.Serialization.XmlElementAttribute("publisher")]
+ public publisher[] publisher
{
get
{
- return this.truncatedFieldSpecified;
+ return this.publisherField;
}
set
{
- this.truncatedFieldSpecified = value;
+ this.publisherField = value;
}
}
}
@@ -1484,12 +1496,12 @@ namespace org.apache.juddi.apiv3
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace = "urn:juddi-apache-org:api_v3")]
- public partial class save_publisher
+ public partial class delete_publisher
{
private string authInfoField;
- private publisher[] publisherField;
+ private string[] publisherIdField;
/// <remarks/>
public string authInfo
@@ -1505,62 +1517,78 @@ namespace org.apache.juddi.apiv3
}
/// <remarks/>
- [System.Xml.Serialization.XmlElementAttribute("publisher")]
- public publisher[] publisher
+ [System.Xml.Serialization.XmlElementAttribute("publisherId")]
+ public string[] publisherId
{
get
{
- return this.publisherField;
+ return this.publisherIdField;
}
set
{
- this.publisherField = value;
+ this.publisherIdField = value;
}
}
}
-
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace = "urn:juddi-apache-org:api_v3")]
- public partial class delete_publisher
+ public partial class publisherDetail
{
- private string authInfoField;
+ private publisher[] publisherField;
- private string[] publisherIdField;
+ private bool truncatedField;
+
+ private bool truncatedFieldSpecified;
/// <remarks/>
- public string authInfo
+ [System.Xml.Serialization.XmlElementAttribute("publisher", IsNullable = true)]
+ public publisher[] publisher
{
get
{
- return this.authInfoField;
+ return this.publisherField;
}
set
{
- this.authInfoField = value;
+ this.publisherField = value;
}
}
/// <remarks/>
- [System.Xml.Serialization.XmlElementAttribute("publisherId")]
- public string[] publisherId
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public bool truncated
{
get
{
- return this.publisherIdField;
+ return this.truncatedField;
}
set
{
- this.publisherIdField = value;
+ this.truncatedField = value;
+ }
+ }
+
+ /// <remarks/>
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool truncatedSpecified
+ {
+ get
+ {
+ return this.truncatedFieldSpecified;
+ }
+ set
+ {
+ this.truncatedFieldSpecified = value;
}
}
}
- /*
+
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
[System.SerializableAttribute()]
@@ -1586,7 +1614,7 @@ namespace org.apache.juddi.apiv3
}
}
}
- */
+
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
[System.SerializableAttribute()]
@@ -1669,7 +1697,7 @@ namespace org.apache.juddi.apiv3
}
}
-
+
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
public delegate void get_publisherDetailCompletedEventHandler(object sender, get_publisherDetailCompletedEventArgs e);
@@ -1774,12 +1802,12 @@ namespace org.apache.juddi.apiv3
}
/// <remarks/>
- public object[] Result
+ public publisherDetail Result
{
get
{
this.RaiseExceptionIfNecessary();
- return ((object[])(this.results[0]));
+ return ((publisherDetail)(this.results[0]));
}
}
}
@@ -1790,10 +1818,6 @@ namespace org.apache.juddi.apiv3
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
- public delegate void adminDelete_tModelCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
public delegate void save_publisherCompletedEventHandler(object sender, save_publisherCompletedEventArgs e);
/// <remarks/>
@@ -1854,6 +1878,10 @@ namespace org.apache.juddi.apiv3
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
+ public delegate void adminDelete_tModelCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.0.30319.17929")]
public delegate void save_ClientSubscriptionInfoCompletedEventHandler(object sender, save_ClientSubscriptionInfoCompletedEventArgs e);
/// <remarks/>
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Thu Jan 16 02:59:33 2014
@@ -88,8 +88,8 @@ public class MappingApiToModel {
modelPublisher.setAuthorizedName(apiPublisher.getAuthorizedName());
modelPublisher.setPublisherName(apiPublisher.getPublisherName());
modelPublisher.setEmailAddress(apiPublisher.getEmailAddress());
- modelPublisher.setIsAdmin(apiPublisher.getIsAdmin());
- modelPublisher.setIsEnabled(apiPublisher.getIsEnabled());
+ modelPublisher.setIsAdmin(apiPublisher.isIsAdmin());
+ modelPublisher.setIsEnabled(apiPublisher.isIsEnabled());
modelPublisher.setMaxBindingsPerService(apiPublisher.getMaxBindingsPerService());
modelPublisher.setMaxBusinesses(apiPublisher.getMaxBusinesses());
modelPublisher.setMaxServicesPerBusiness(apiPublisher.getMaxServicePerBusiness());
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java Thu Jan 16 02:59:33 2014
@@ -38,8 +38,8 @@ public class Publisher extends UddiEntit
private static final long serialVersionUID = 1960575191518050887L;
private String publisherName;
private String emailAddress;
- private String isAdmin;
- private String isEnabled;
+ private Boolean isAdmin;
+ private Boolean isEnabled;
private Integer maxBusinesses;
private Integer maxServicesPerBusiness;
private Integer maxBindingsPerService;
@@ -56,7 +56,7 @@ public class Publisher extends UddiEntit
this.publisherName = publisherName;
}
public Publisher(String publisherId, String publisherName,
- String emailAddress, String isAdmin, String isEnabled,
+ String emailAddress, Boolean isAdmin, Boolean isEnabled,
Integer maxBusinesses, Integer maxServicesPerBusiness,
Integer maxBindingsPerService, Integer maxTmodels) {
@@ -90,39 +90,40 @@ public class Publisher extends UddiEntit
}
@Column(name = "is_admin", length = 5)
- public String getIsAdmin() {
+ public Boolean getIsAdmin() {
return this.isAdmin;
}
- public void setIsAdmin(String isAdmin) {
+ public void setIsAdmin(Boolean isAdmin) {
this.isAdmin = isAdmin;
}
+
+ @Deprecated
+ public void setIsAdmin(String isAdmin) {
+ this.isAdmin = Boolean.parseBoolean(isAdmin);
+ }
@Transient
public boolean isAdmin() {
- boolean ret = false;
- if (getIsAdmin() != null) {
- if (getIsAdmin().equalsIgnoreCase("true"))
- ret = true;
- }
- return ret;
+
+ return isAdmin;
}
@Column(name = "is_enabled", length = 5)
- public String getIsEnabled() {
+ public Boolean getIsEnabled() {
return this.isEnabled;
}
- public void setIsEnabled(String isEnabled) {
+ public void setIsEnabled(Boolean isEnabled) {
this.isEnabled = isEnabled;
}
-
+
+ @Deprecated
+ public void setIsEnabled(String isEnabled) {
+ this.isEnabled = Boolean.parseBoolean(isEnabled);
+ }
+
@Transient
public boolean isEnabled() {
- boolean ret = false;
- if (getIsEnabled() != null) {
- if (getIsEnabled().equalsIgnoreCase("true"))
- ret = true;
- }
- return ret;
+ return getIsEnabled();
}
@Column(name = "max_businesses")
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java Thu Jan 16 02:59:33 2014
@@ -61,7 +61,7 @@ public class JUDDIApiService extends Uni
throws DispositionReportFaultMessage, RemoteException {
return juddiAPI.getAllPublisherDetail(body);
}
-
+
public PublisherDetail getPublisherDetail(GetPublisherDetail body)
throws DispositionReportFaultMessage, RemoteException {
return juddiAPI.getPublisherDetail(body);
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java Thu Jan 16 02:59:33 2014
@@ -401,7 +401,8 @@ public class SubscriptionNotifier extend
//} else {
//log.warn("Unexpected WebServiceException " + e.getMessage() + e.getCause());
}
- log.warn("Unexpected notification exception:" + e.getMessage() + e.getCause(),e);
+ log.warn("Unexpected notification exception:" + e.getMessage() + e.getCause());
+ log.debug("Unexpected notification exception:" + e.getMessage() + e.getCause(),e);
}
} else {
log.info("Binding " + bindingTemplate.getEntityKey() + " has an unsupported binding type of "
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java Thu Jan 16 02:59:33 2014
@@ -168,8 +168,8 @@ public class API_010_PublisherTest {
assertEquals(pubIn.getAuthorizedName(), pubOut.getAuthorizedName());
assertEquals(pubIn.getPublisherName(), pubOut.getPublisherName());
assertEquals(pubIn.getEmailAddress(), pubOut.getEmailAddress());
- assertEquals(pubIn.getIsAdmin(), pubOut.getIsAdmin());
- assertEquals(pubIn.getIsEnabled(), pubOut.getIsEnabled());
+ assertEquals(pubIn.isIsAdmin(), pubOut.isIsAdmin());
+ assertEquals(pubIn.isIsEnabled(), pubOut.isIsEnabled());
assertEquals(pubIn.getMaxBindingsPerService(), pubOut.getMaxBindingsPerService());
assertEquals(pubIn.getMaxBusinesses(), pubOut.getMaxBusinesses());
assertEquals(pubIn.getMaxServicePerBusiness(), pubOut.getMaxServicePerBusiness());
Modified: juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java (original)
+++ juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java Thu Jan 16 02:59:33 2014
@@ -65,7 +65,7 @@ public class SimplePublishPortable {
getAuthTokenMyPub.setUserID("bob"); //your username
getAuthTokenMyPub.setCred("bob"); //your password
AuthToken myPubAuthToken = security.getAuthToken(getAuthTokenMyPub);
- System.out.println("myPub AUTHTOKEN = " + "******* never log auth tokens!");
+ System.out.println(getAuthTokenMyPub.getUserID() + "'s AUTHTOKEN = " + "******* never log auth tokens!");
// Creating the parent business entity that will contain our service.
BusinessEntity myBusEntity = new BusinessEntity();
Modified: juddi/trunk/juddi-gui/src/main/webapp/header-bottom.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/header-bottom.jsp?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/header-bottom.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/header-bottom.jsp Thu Jan 16 02:59:33 2014
@@ -20,9 +20,9 @@
<div style="
padding: 0px 0px 0px 0px; bottom: 0px; margin: 0px 0px 0px 0px; width:100%; text-align: center; position: fixed;
background-color: white;
- "><center><footer> - v<%
+ "><center><footer>v<%
out.write(StringEscapeUtils.escapeHtml(org.apache.juddi.v3.client.Release.getRegistryVersion()));
- %> - <a href="http://www.apache.org"><%=ResourceLoader.GetResource(session, "footer.apachecopyright")%></a</footer></center></div>
+ %> - <a href="http://www.apache.org"><%=ResourceLoader.GetResource(session, "footer.apachecopyright")%></a></footer></center></div>
</body>
</html>
Modified: juddi/trunk/juddi-gui/src/main/webapp/user/warningbanner.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/user/warningbanner.jsp?rev=1558676&r1=1558675&r2=1558676&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/user/warningbanner.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/user/warningbanner.jsp Thu Jan 16 02:59:33 2014
@@ -3,11 +3,22 @@
Created on : Jan 14 2014, 6:08:15 PM
Author : Alex O'Ree
-Here's an example of an always on top banner, similiar to what's used by government agencys
+Here's an example of an always on top banner, similar to what's used by government agencies
--%>
-<div style="top:0px; background-color: lime; background-image: none; position: fixed; left:50%; z-index: 9000; padding-left: 5px; padding-right:5px">
-Your Banner or Disclaimer goes here</div>
+<div style="top:40px; background-image: none; position: fixed; width:100%; z-index: 9000; padding-left: 5px; padding-right:5px; ">
+ <center>
+ <table cellspacing="0" cellpadding="0">
+ <tr>
+ <td align="center" width="100%" bgcolor="lime">
+ <font size="2" color="#000000"><b>
+ <center>
+ Your Banner or Disclaimer goes here
+ </center>
+ </b></font>
+ </td>
+ </tr>
+ </table>
+ </center>
+</div>
-<div style="bottom:0px; background-color: lime; background-image: none; position: fixed; left:50%; z-index: 9000; padding-left: 5px; padding-right:5px">
-Your Banner or Disclaimer goes here</div>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org