juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject [1/6] juddi git commit: JUDDI-910 directed graph replication is now implemented, 3 instances of tomcat are now generates with juddi-tomcat build JUDDI-923 change record browser added, soap methods added for obtaining only failed (to apply changes) record
Date Thu, 29 Jan 2015 15:18:09 GMT
Repository: juddi
Updated Branches:
  refs/heads/master 2a243727f -> c0354a44f


http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/juddiv3-war/src/main/webapp/admin/changes.jsp
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/admin/changes.jsp b/juddiv3-war/src/main/webapp/admin/changes.jsp
new file mode 100644
index 0000000..1a86ed2
--- /dev/null
+++ b/juddiv3-war/src/main/webapp/admin/changes.jsp
@@ -0,0 +1,186 @@
+<%-- 
+    Document   : change record browser
+    Created on : Jan 27, 2015, 2:05:35 PM
+    Author     : Alex O'Ree
+/*
+ * Copyright 2001-2008 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+--%>
+
+
+<%@page import="org.apache.juddi.config.Property"%>
+<%@page import="org.apache.juddi.config.AppConfig"%>
+<%@page import="org.apache.juddi.api_v3.Publisher"%>
+<%@page import="org.apache.juddi.api_v3.SavePublisher"%>
+<%@page import="org.apache.juddi.api_v3.Clerk"%>
+<%@page import="org.apache.juddi.api_v3.SaveClerk"%>
+<%@page import="org.apache.juddi.api_v3.SyncSubscription"%>
+<%@page import="org.apache.juddi.api_v3.GetPublisherDetail"%>
+<%@page import="org.apache.juddi.api_v3.GetAllPublisherDetail"%>
+<%@page import="org.apache.juddi.api_v3.DeletePublisher"%>
+<%@page import="org.uddi.api_v3.DeleteTModel"%>
+<%@page import="org.apache.juddi.v3_service.JUDDIApiPortType"%>
+<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@include file="header-top.jsp"%>
+
+<div class="container">
+
+    <!-- Main hero unit for a primary marketing message or call to action -->
+    <div class="well">
+        <h1><%=ResourceLoader.GetResource(session, "pages.home.admin")%></h1>
+
+    </div>
+
+    <!-- Example row of columns -->
+    <div class="row">
+
+
+        <div class="span12">
+            <% UddiAdminHub x = UddiAdminHub.getInstance(application, session);
+
+            %> 
+            Change Record browser, you can use your left and right keyboard keys to page through the change records<br>
+            You are connected to: <%=StringEscapeUtils.escapeHtml(AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID))%><br>
+            <br>
+            <div>
+
+                <a href="javascript:recordDown();"><i class="icon-circle-arrow-left  icon-2x" id="pageupBusiness"></i></a>
+                <a href="javascript:recordUp();"><i class="icon-circle-arrow-right  icon-2x" id="pagedownBusiness"></i></a>
+                <br>
+                Record ID:    <input type="text" id="recordid" value="1"><Br>
+                NodeID: <input type="text" id="nodeid" value="<%=StringEscapeUtils.escapeHtml(AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID))%>">
+                <br>
+
+
+            </div>
+            <div id="resultsBrowser">
+                <img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>
+            </div>
+            <script type="text/javascript">
+
+                function recordUp() {
+                    $("#recordid").val(parseInt($("#recordid").val()) + 1);
+                    go();
+                }
+                function recordDown() {
+                    $("#recordid").val(parseInt($("#recordid").val()) - 1);
+                    if ($("#recordid").val() < 1)
+                    {
+                        $("#recordid").val(1);
+                    }
+                    else
+                        go();
+                }
+                function go() {
+                    var url = 'ajax/go.jsp';
+
+                    var postbackdata = new Array();
+
+                    var x = $("#divselector").val();
+                    postbackdata.push({
+                        name: "soapaction",
+                        value: "changeRecord"
+                    });
+
+                    postbackdata.push({
+                        name: "nonce",
+                        value: $("#nonce").val()
+                    });
+                    postbackdata.push({
+                        name: "recordid",
+                        value: $("#recordid").val()
+                    });
+
+
+                    postbackdata.push({
+                        name: "nodeid",
+                        value: $("#nodeid").val()
+                    });
+
+
+
+
+
+                    var request = $.ajax({
+                        url: url,
+                        type: "POST",
+                        //  data" + i18n_type + ": "html", 
+                        cache: false,
+                        //  processData: false,f
+                        data: postbackdata
+                    });
+
+
+                    request.done(function (msg) {
+                        window.console && console.log('postback done ' + url);
+                        $("#resultsBrowser").html(msg);
+                        //$('#adminresultsmodal').modal();
+
+                    });
+
+                    request.fail(function (jqXHR, textStatus) {
+                        window.console && console.log('postback failed ' + url);
+                        $("#adminresults").html(jqXHR.responseText + textStatus);
+                        $('#adminresultsmodal').modal();
+
+                    });
+                }
+                go(); //run when the page loads
+
+                $(document).keydown(function (e) {
+                    switch (e.which) {
+                        case 37: // left
+                            recordDown();
+                            break;
+
+                        case 39: // right
+                            recordUp();
+                            break;
+
+                        default:
+                            return; // exit this handler for other keys
+                    }
+                    e.preventDefault(); // prevent the default action (scroll / move caret)
+                });
+
+
+            </script>
+            <br>
+            <%=ResourceLoader.GetResource(session, "pages.admin.notes")%>
+
+            <br>
+            <a href="javascript:submitform();" class="btn btn-primary"><%=ResourceLoader.GetResource(session, "actions.go")%></a><br><br>
+            <br>
+
+        </div>
+    </div>
+
+
+    <div class="modal hide fade container " id="adminresultsmodal">
+        <div class="modal-header">
+            <a href="javascript:$('#adminresultsmodal').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
+            <h3><%=ResourceLoader.GetResource(session, "items.results")%></h3>
+        </div>
+        <div class="modal-body" align="center">
+            <div id="adminresults"></div>
+        </div>
+        <div class="modal-footer">
+            <a href="javascript:$('#adminresultsmodal').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+        </div>
+    </div>
+
+    <%@include file="header-bottom.jsp"%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/juddiv3-war/src/main/webapp/admin/csrf.jsp
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/admin/csrf.jsp b/juddiv3-war/src/main/webapp/admin/csrf.jsp
index edff942..53d89e7 100644
--- a/juddiv3-war/src/main/webapp/admin/csrf.jsp
+++ b/juddiv3-war/src/main/webapp/admin/csrf.jsp
@@ -48,7 +48,10 @@
             session.removeAttribute("nonce");
             response.sendRedirect("index.jsp");
             UddiAdminHub.log.warn( "CSRF Test failed, no nonce guid." + request.getRemoteAddr() + request.getRemoteUser());
-            throw new CrossSiteRequestForgeryException();
+            //throw new CrossSiteRequestForgeryException();
+            response.sendRedirect("index.jsp");
+                
+                return;
         } else {
 
             String noncestr = (String) session.getAttribute("nonce");
@@ -56,7 +59,10 @@
                 //no session variable to test against, reject it
                 UddiAdminHub.log.warn( "CSRF Test failed, no session guid." + request.getRemoteAddr() + request.getRemoteUser());
                 session.removeAttribute("nonce");
-                throw new CrossSiteRequestForgeryException("Cross Site Request Forgery");
+                //throw new CrossSiteRequestForgeryException("Cross Site Request Forgery");
+                response.sendRedirect("index.jsp");
+                
+                return;
             }
             String postedstr = request.getParameter("nonce");
 
@@ -74,7 +80,10 @@
                 //mismatch, reject it
                 UddiAdminHub.log.warn( "CSRF Test failed, session did not match nonce guid." + request.getRemoteAddr() + request.getRemoteUser());
                 session.removeAttribute("nonce");
-                throw new CrossSiteRequestForgeryException("Cross Site Request Forgery");
+                //throw new CrossSiteRequestForgeryException("Cross Site Request Forgery");
+                response.sendRedirect("index.jsp");
+                
+                return;
             }
         }
     } else {

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/juddiv3-war/src/main/webapp/admin/home.jsp
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/admin/home.jsp b/juddiv3-war/src/main/webapp/admin/home.jsp
index f237f5e..f4e4edc 100644
--- a/juddiv3-war/src/main/webapp/admin/home.jsp
+++ b/juddiv3-war/src/main/webapp/admin/home.jsp
@@ -52,4 +52,22 @@
         </div>
 
     </div>
+            
+             <div class="row">
+
+
+        <div class="span4">
+            <h2><%=ResourceLoader.GetResource(session, "pages.admin.changes")%></h2>
+            <p><%=ResourceLoader.GetResource(session, "pages.admin.changes.content")%></p>
+            <p><a class="btn btn-primary" href="changes.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> &raquo;</a></p>
+        </div>
+        <div class="span4">
+          
+        </div>
+        <div class="span4">
+          
+        </div>
+
+    </div>
+            
 <%@include file="header-bottom.jsp"%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntitySigned.xml
----------------------------------------------------------------------
diff --git a/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntitySigned.xml b/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntitySigned.xml
new file mode 100644
index 0000000..c717a94
--- /dev/null
+++ b/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntitySigned.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" businessKey="uddi:uddi.joepublisher.com:businessone">
+    <discoveryURLs>
+        <discoveryURL useType="home">http://www.businessone.com</discoveryURL>
+        <discoveryURL useType="serviceList">http://www.businessone.com/services</discoveryURL>
+    </discoveryURLs>
+    <name xml:lang="en">John Doe Enterprises</name>
+    <name xml:lang="es">Negocio Uno</name>
+    <description xml:lang="en">This is the description for Business One.</description>
+    <contacts>
+        <contact useType="administrator">
+            <description xml:lang="en">This is the administrator of the service offerings.</description>
+            <description xml:lang="es">Éste es el administrador de las ofrendas del servicio.</description>
+            <personName xml:lang="en">John Doe</personName>
+            <personName xml:lang="es">Juan Doe</personName>
+            <phone useType="office">123-456-7890</phone>
+            <phone useType="mobile">987-654-3210</phone>
+            <email useType="work">jdoe@businessone.com</email>
+            <address xml:lang="en" useType="headquarters" sortCode="1" tModelKey="uddi:tmodelKey:address">
+                <addressLine keyName="Suite" keyValue="suite">Suite 1500</addressLine>
+                <addressLine keyName="Street" keyValue="street">1515 Main St.</addressLine>
+                <addressLine keyName="ZipCode" keyValue="citystatezip">Chicago, IL 60614</addressLine>
+                <addressLine keyName="Country" keyValue="country">USA</addressLine>
+            </address>
+        </contact>
+        <contact useType="engineer">
+            <personName xml:lang="en">Steve Smith</personName>
+            <phone useType="office">555-111-2222</phone>
+            <email useType="work">ssmith@businessone.com</email>
+        </contact>
+    </contacts>
+    <identifierBag>
+        <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="identify" keyValue="identity"/>
+    </identifierBag>
+    <categoryBag>
+        <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="apples"/>
+        <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="oranges"/>
+        <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="football"/>
+        <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="blues"/>
+        <keyedReferenceGroup tModelKey="uddi:uddi.org:categorization:types">
+            <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="blank" keyValue="blank"/>
+        </keyedReferenceGroup>
+    </categoryBag>
+    <ns2:Signature>
+        <ns2:SignedInfo>
+            <ns2:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+            <ns2:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+            <ns2:Reference URI="">
+                <ns2:Transforms>
+                    <ns2:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+                </ns2:Transforms>
+                <ns2:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+                <ns2:DigestValue>rvNogU3NRBPGMKFywVneyEcKY2E=</ns2:DigestValue>
+            </ns2:Reference>
+        </ns2:SignedInfo>
+        <ns2:SignatureValue>fMYrww5viuz3txGgqMkUDdVNLcwt+CHTPsOy9FFYvO8gQQOk+8qQUrjn34cBcNVEZB/jAcfN38Y2BdyLCWfUKL628OhS99anM4jxTM6WmYNLZasemA8ogG2FXIcs4t3ReIQt7yoddKZQIff8CqfCYYmu32PJVLb/r1yXE2WU+WZUBtJIYLbJl8Fobqve2nBBiuqo/IGa4T8OsS0Bp/+T9xDaNNgvSavxRrA2HWru4CAA1x2OL7IDNu9FqKU0Mfd8XLMMElULqn9mkUUz9s9MXr2z9B2xkJg0vKRcjscKAB75O/xekWLpckvInxxyTaVGu9ltIVAYgse0p2f8Q+r8xw==</ns2:SignatureValue>
+        <ns2:KeyInfo>
+            <ns2:X509Data>
+                <ns2:X509SubjectName>CN=Test, OU=JUDDI, O=Apache Software Foundation, ST=MD, C=US, EMAILADDRESS=dev@juddi.apache.org</ns2:X509SubjectName>
+            </ns2:X509Data>
+            <ns2:X509Data>
+                <ns2:X509Certificate>MIIDhDCCAmygAwIBAgIEUbJimDANBgkqhkiG9w0BAQUFADCBgzEjMCEGCSqGSIb3DQEJARYUZGV2QGp1ZGRpLmFwYWNoZS5vcmcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNRDEjMCEGA1UECgwaQXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24xDjAMBgNVBAsMBUpVRERJMQ0wCwYDVQQDDARUZXN0MB4XDTEzMDYwNzIyNDcwOVoXDTE4MDYwNzIyNDcwOVowgYMxIzAhBgkqhkiG9w0BCQEWFGRldkBqdWRkaS5hcGFjaGUub3JnMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTUQxIzAhBgNVBAoMGkFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMQ4wDAYDVQQLDAVKVURESTENMAsGA1UEAwwEVGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJeQKlGDFqJ6MjZE+8VtxDOiYfRnHpIxFGJa/+JVE54ewEtt46ZBjrzusQg7+X+auyWo1dXFsN1T4cfacvlCuEQeC+cli8ODp0BOXMehfMvFwbgDjGqM3dKLPBbCeKUfWuCSE61myaMM4AIzugLysPAc2egTxX5qfahpZn320oN2rBepOUJQjvXFC+KWDgzGOwMiQV9wlYSXo7v2Mpnn/lqjwiBS/LDo0tiZddPUKFtjpLIUmbo7EfOPUEXOWUKrZRVynNVzCA3acNOG0CW5az0dcArC1EwGGsBQXQ9aJMecMxmRjjTnNq7rlmwcQ+jNrKR9rcc/YwY1WobsT4oLDbsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAAQrCcu12ywSD2qCI0nOKZ/mAx0oAitUGwY0ISMMcgdSUZqam0bGwXSorQ1QkZM92NDFkY33tSkQh8GUrNQX2FyV+rJHJ3pQ3
 oqMNzkGne8PQSiTMbwx4S1nCrnp2hUh+0k9ro4pmJKx9FHrp6LvFIbOMhky7UK41pzBaM46xD27kPhVcPWLrcPMrulsmMo4d9fFnriA0/ow4rIilCMh5TcUdvQyX3T7RWTxb8y1eNuYp8uPWz6VwV+vLDQLPU1CDYhG6IbeJyOpEkxXXhXvv+7KXOQXe3EnS0yf90imssutLJNfv389y/alAZHcY8+petAObXmyWTZeULq/RImtZhA==</ns2:X509Certificate>
+            </ns2:X509Data>
+            <ns2:X509Data>
+                <ns2:X509IssuerSerial>
+                    <ns2:X509IssuerName>CN=Test,OU=JUDDI,O=Apache Software Foundation,ST=MD,C=US,1.2.840.113549.1.9.1=#1614646576406a756464692e6170616368652e6f7267</ns2:X509IssuerName>
+                    <ns2:X509SerialNumber>1370645144</ns2:X509SerialNumber>
+                </ns2:X509IssuerSerial>
+            </ns2:X509Data>
+        </ns2:KeyInfo>
+    </ns2:Signature>
+</businessEntity>

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-tck/pref-rpt-1422229264251.txt
----------------------------------------------------------------------
diff --git a/uddi-tck/pref-rpt-1422229264251.txt b/uddi-tck/pref-rpt-1422229264251.txt
new file mode 100644
index 0000000..9117eaf
--- /dev/null
+++ b/uddi-tck/pref-rpt-1422229264251.txt
@@ -0,0 +1,12 @@
+Insert Flat Businesses Bulk = 5.0 tx/ms
+Insert Flat Businesses 1x ManyNames = 0.09740259740259741 tx/ms
+Insert Flat Businesses 1x = 0.1595744680851064 tx/ms
+Delete Flat Businesses Bulk ManyCategories = 1.875 tx/ms
+Insert Flat Businesses Bulk ManyCategories = 0.23255813953488372 tx/ms
+Delete Flat Businesses 1x ManyCategories = 0.11029411764705882 tx/ms
+Delete Flat Businesses Bulk = 5.0 tx/ms
+Insert Flat Businesses 1x ManyCategories = 0.019417475728155338 tx/ms
+Delete Flat Businesses Bulk ManyNames = 3.75 tx/ms
+Delete Flat Businesses 1x = 0.1595744680851064 tx/ms
+Delete Flat Businesses 1x ManyNames = 0.1214574898785425 tx/ms
+Insert Flat Businesses Bulk ManyNames = 3.0 tx/ms

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java
index 86afb69..90b1f73 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java
@@ -471,7 +471,7 @@ public class JUDDI_300_MultiNodeIntegrationTest {
                 Assume.assumeTrue(TckPublisher.isReplicationEnabled());
                 Assume.assumeTrue(TckPublisher.isJUDDI());
                 try {
-                        TckCommon.PrintMarker();
+                        //TckCommon.PrintMarker();
                         logger.info("testReplicationTModelBusinessPublisherAssertionAddDelete");
 
                         resetTmodels();
@@ -978,15 +978,19 @@ public class JUDDI_300_MultiNodeIntegrationTest {
                         Assert.assertEquals(tModelDetail.getTModel().get(0).isDeleted(), true);
                         logger.info("sam's tModel was deleted(hidden) replicated");
                         // TckCommon.PrintMarker();
+                        logger.info("Test passed");
 
                 } finally {
-                        TckCommon.PrintMarker();
-                        logger.fatal("The test failed, attempting to clean up the business and tModels");
+                        //TckCommon.PrintMarker();
+                        //logger.fatal("The test failed, attempting to clean up the business and tModels");
                         try {
                                 DeleteBusiness db = new DeleteBusiness();
                                 db.setAuthInfo(samTokenNode2);
                                 db.getBusinessKey().add(TckBusiness.SAM_BUSINESS_KEY);
+                                try{
                                 publishSamNode2.deleteBusiness(db);
+                                }
+                                catch (Exception ex){}
                                 int timeout = TckPublisher.getSubscriptionTimeout();
                                 GetBusinessDetail findTModel = new GetBusinessDetail();
                                 findTModel.setAuthInfo(maryTokenNode1);

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java
index 4debdf5..a9268cb 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java
@@ -26,6 +26,7 @@ import static org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerIntegrationBa
 import static org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerIntegrationBase.startManager;
 import static org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerIntegrationBase.stopManager;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 
 /**
@@ -56,23 +57,36 @@ public class UDDI_090_RMIIntegrationTest extends UDDI_090_SubscriptionListenerIn
                         return;
                 }
                 startManager();
-
-                randomPort = 19800 + new Random().nextInt(99);
-                System.out.println("RMI Random port=" + randomPort);
-                //bring up the RMISubscriptionListener
-                URI rmiEndPoint = new URI("rmi://localhost:" + randomPort + "/tck/rmisubscriptionlistener");
-                registry = LocateRegistry.createRegistry(rmiEndPoint.getPort());
-                String path = rmiEndPoint.getPath();
-                hostname = InetAddress.getLocalHost().getHostName();
-                //starting the service
+                int count = 0;
                 rmiSubscriptionListenerService = new UDDISubscriptionListenerImpl(0);
-                //binding to the RMI Registry
-                registry.bind(path, rmiSubscriptionListenerService);
-
-                //double check that the service is bound in the local Registry
-                Registry registry2 = LocateRegistry.getRegistry(rmiEndPoint.getHost(), rmiEndPoint.getPort());
-                registry2.lookup(rmiEndPoint.getPath());
-
+                UDDISubscriptionListenerImpl.notifcationMap.clear();
+                UDDISubscriptionListenerImpl.notificationCount=0;
+                while (true && count < 5) {
+                        try {
+                                count++;
+                                randomPort = 19800 + new Random().nextInt(99);
+                                System.out.println("RMI Random port=" + randomPort);
+                                //bring up the RMISubscriptionListener
+                                URI rmiEndPoint = new URI("rmi://localhost:" + randomPort + "/tck/rmisubscriptionlistener");
+                                registry = LocateRegistry.createRegistry(rmiEndPoint.getPort());
+
+                                String path = rmiEndPoint.getPath();
+                                hostname = InetAddress.getLocalHost().getHostName();
+                                //starting the service
+
+                                //binding to the RMI Registry
+                                registry.bind(path, rmiSubscriptionListenerService);
+
+                                //double check that the service is bound in the local Registry
+                                Registry registry2 = LocateRegistry.getRegistry(rmiEndPoint.getHost(), rmiEndPoint.getPort());
+                                registry2.lookup(rmiEndPoint.getPath());
+                                break;
+                        } catch (Exception ex) {
+                                logger.warn("trouble starting rmi endpoint " + ex.getMessage());
+                        }
+                }
+                Assert.assertNotNull(registry);
+                Assert.assertNotNull(hostname);
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-ws/pom.xml.orig
----------------------------------------------------------------------
diff --git a/uddi-ws/pom.xml.orig b/uddi-ws/pom.xml.orig
new file mode 100644
index 0000000..0f234e3
--- /dev/null
+++ b/uddi-ws/pom.xml.orig
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* Copyright 2001-2009 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* 
+*      http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<<<<<<< HEAD
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-parent</artifactId>
+        <version>3.2.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>uddi-ws</artifactId>
+    <packaging>bundle</packaging>
+    <name>UDDIv2 and v3 WS Stubs and Schema Bindings Generated from WSDL</name>
+    <profiles>
+=======
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.juddi</groupId>
+		<artifactId>juddi-parent</artifactId>
+		<version>3.3.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>uddi-ws</artifactId>
+	<packaging>bundle</packaging>
+	<name>UDDIv2 and v3 WS Stubs and Schema Bindings Generated from WSDL</name>
+	<profiles>
+>>>>>>> 63d53d0869f8c56ef7f07bc1a09fbe4b1ab825a2
+        <profile>
+            <id>regenerate-source</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>jaxws-maven-plugin</artifactId>
+                        <!-- version??? -->
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>wsimport</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <wsdlDirectory>src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>uddi_v3_service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <keep>true</keep>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+            <version>1.0</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <scope>test</scope>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-databinding-jaxb</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetFailedReplicationChangeRecordsMessageRequest.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetFailedReplicationChangeRecordsMessageRequest.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetFailedReplicationChangeRecordsMessageRequest.java
new file mode 100644
index 0000000..0b052c2
--- /dev/null
+++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetFailedReplicationChangeRecordsMessageRequest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.api_v3;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for getFailedReplicationChangeRecordsMessageRequest complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="getFailedReplicationChangeRecordsMessageRequest">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="authInfo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="maxRecords" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ *         &lt;element name="offset" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "getFailedReplicationChangeRecordsMessageRequest", propOrder = {
+    "authInfo",
+    "maxRecords",
+    "offset"
+})
+public class GetFailedReplicationChangeRecordsMessageRequest {
+
+    protected String authInfo;
+    protected long maxRecords;
+    protected long offset;
+
+    /**
+     * Gets the value of the authInfo property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAuthInfo() {
+        return authInfo;
+    }
+
+    /**
+     * Sets the value of the authInfo property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAuthInfo(String value) {
+        this.authInfo = value;
+    }
+
+    /**
+     * Gets the value of the maxRecords property.
+     * 
+     */
+    public long getMaxRecords() {
+        return maxRecords;
+    }
+
+    /**
+     * Sets the value of the maxRecords property.
+     * 
+     */
+    public void setMaxRecords(long value) {
+        this.maxRecords = value;
+    }
+
+    /**
+     * Gets the value of the offset property.
+     * 
+     */
+    public long getOffset() {
+        return offset;
+    }
+
+    /**
+     * Sets the value of the offset property.
+     * 
+     */
+    public void setOffset(long value) {
+        this.offset = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetFailedReplicationChangeRecordsMessageResponse.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetFailedReplicationChangeRecordsMessageResponse.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetFailedReplicationChangeRecordsMessageResponse.java
new file mode 100644
index 0000000..1fb2e5a
--- /dev/null
+++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetFailedReplicationChangeRecordsMessageResponse.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.api_v3;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.uddi.repl_v3.ChangeRecords;
+
+
+/**
+ * <p>Java class for getFailedReplicationChangeRecordsMessageResponse complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="getFailedReplicationChangeRecordsMessageResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{urn:uddi-org:repl_v3}changeRecords"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "getFailedReplicationChangeRecordsMessageResponse", propOrder = {
+    "changeRecords"
+})
+public class GetFailedReplicationChangeRecordsMessageResponse {
+
+    @XmlElement(namespace = "urn:uddi-org:repl_v3", required = true)
+    protected ChangeRecords changeRecords;
+
+    /**
+     * Gets the value of the changeRecords property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ChangeRecords }
+     *     
+     */
+    public ChangeRecords getChangeRecords() {
+        return changeRecords;
+    }
+
+    /**
+     * Sets the value of the changeRecords property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ChangeRecords }
+     *     
+     */
+    public void setChangeRecords(ChangeRecords value) {
+        this.changeRecords = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
index 7d7e663..de93e8e 100644
--- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
+++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2009 The Apache Software Foundation.
+ * Copyright 2001-2008 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,8 +42,8 @@ public class ObjectFactory {
 
     private final static QName _AdminDeleteSubscriptionResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "adminDelete_SubscriptionResponse");
     private final static QName _GetReplicationNodesResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_ReplicationNodesResponse");
-    private final static QName _SetReplicationNodes_QNAME = new QName("urn:juddi-apache-org:api_v3", "set_ReplicationNodes");
     private final static QName _GetAllPublisherDetail_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_allPublisherDetail");
+    private final static QName _SetReplicationNodes_QNAME = new QName("urn:juddi-apache-org:api_v3", "set_ReplicationNodes");
     private final static QName _DeleteClerk_QNAME = new QName("urn:juddi-apache-org:api_v3", "delete_Clerk");
     private final static QName _SyncSubscription_QNAME = new QName("urn:juddi-apache-org:api_v3", "sync_subscription");
     private final static QName _AdminSaveTModelResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "adminSave_tModelResponse");
@@ -53,6 +53,8 @@ public class ObjectFactory {
     private final static QName _AdminSaveBusinessResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "adminSave_BusinessResponse");
     private final static QName _GetAllClientSubscriptionInfoResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_allClientSubscriptionInfoResponse");
     private final static QName _SyncSubscriptionDetail_QNAME = new QName("urn:juddi-apache-org:api_v3", "sync_subscriptionDetail");
+    private final static QName _GetFailedReplicationChangeRecordsMessageResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "getFailedReplicationChangeRecordsMessageResponse");
+    private final static QName _GetFailedReplicationChangeRecordsMessage_QNAME = new QName("urn:juddi-apache-org:api_v3", "getFailedReplicationChangeRecordsMessage");
     private final static QName _InvokeSyncSubscription_QNAME = new QName("urn:juddi-apache-org:api_v3", "invoke_SyncSubscription");
     private final static QName _AdminSaveSubscriptionResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "adminSave_SubscriptionResponse");
     private final static QName _DeleteNode_QNAME = new QName("urn:juddi-apache-org:api_v3", "delete_Node");
@@ -60,8 +62,8 @@ public class ObjectFactory {
     private final static QName _GetPublisherDetail_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_publisherDetail");
     private final static QName _SavePublisher_QNAME = new QName("urn:juddi-apache-org:api_v3", "save_publisher");
     private final static QName _DeletePublisher_QNAME = new QName("urn:juddi-apache-org:api_v3", "delete_publisher");
-    private final static QName _SaveClerkRequest_QNAME = new QName("urn:juddi-apache-org:api_v3", "save_ClerkRequest");
     private final static QName _AdminDeleteSubscription_QNAME = new QName("urn:juddi-apache-org:api_v3", "adminDelete_Subscription");
+    private final static QName _SaveClerkRequest_QNAME = new QName("urn:juddi-apache-org:api_v3", "save_ClerkRequest");
     private final static QName _DeleteClientSubscriptionInfo_QNAME = new QName("urn:juddi-apache-org:api_v3", "delete_ClientSubscriptionInfo");
     private final static QName _SaveNodeRequest_QNAME = new QName("urn:juddi-apache-org:api_v3", "save_NodeRequest");
     private final static QName _GetAllNodesResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_AllNodesResponse");
@@ -86,46 +88,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ClientSubscriptionInfoDetail }
-     * 
-     */
-    public ClientSubscriptionInfoDetail createClientSubscriptionInfoDetail() {
-        return new ClientSubscriptionInfoDetail();
-    }
-
-    /**
-     * Create an instance of {@link NodeDetail }
-     * 
-     */
-    public NodeDetail createNodeDetail() {
-        return new NodeDetail();
-    }
-
-    /**
-     * Create an instance of {@link ClerkDetail }
-     * 
-     */
-    public ClerkDetail createClerkDetail() {
-        return new ClerkDetail();
-    }
-
-    /**
-     * Create an instance of {@link SyncSubscriptionDetailResponse }
-     * 
-     */
-    public SyncSubscriptionDetailResponse createSyncSubscriptionDetailResponse() {
-        return new SyncSubscriptionDetailResponse();
-    }
-
-    /**
-     * Create an instance of {@link PublisherDetail }
-     * 
-     */
-    public PublisherDetail createPublisherDetail() {
-        return new PublisherDetail();
-    }
-
-    /**
      * Create an instance of {@link DeleteClientSubscriptionInfo }
      * 
      */
@@ -198,6 +160,14 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link GetFailedReplicationChangeRecordsMessageResponse }
+     * 
+     */
+    public GetFailedReplicationChangeRecordsMessageResponse createGetFailedReplicationChangeRecordsMessageResponse() {
+        return new GetFailedReplicationChangeRecordsMessageResponse();
+    }
+
+    /**
      * Create an instance of {@link GetEntityHistoryMessageResponse }
      * 
      */
@@ -222,6 +192,14 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link PublisherDetail }
+     * 
+     */
+    public PublisherDetail createPublisherDetail() {
+        return new PublisherDetail();
+    }
+
+    /**
      * Create an instance of {@link SyncSubscriptionRequest }
      * 
      */
@@ -254,6 +232,14 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link GetFailedReplicationChangeRecordsMessageRequest }
+     * 
+     */
+    public GetFailedReplicationChangeRecordsMessageRequest createGetFailedReplicationChangeRecordsMessageRequest() {
+        return new GetFailedReplicationChangeRecordsMessageRequest();
+    }
+
+    /**
      * Create an instance of {@link GetEntityHistoryMessageRequest }
      * 
      */
@@ -398,6 +384,14 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link SyncSubscriptionDetailResponse }
+     * 
+     */
+    public SyncSubscriptionDetailResponse createSyncSubscriptionDetailResponse() {
+        return new SyncSubscriptionDetailResponse();
+    }
+
+    /**
      * Create an instance of {@link SubscriptionWrapper }
      * 
      */
@@ -422,6 +416,22 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link ClientSubscriptionInfoDetail }
+     * 
+     */
+    public ClientSubscriptionInfoDetail createClientSubscriptionInfoDetail() {
+        return new ClientSubscriptionInfoDetail();
+    }
+
+    /**
+     * Create an instance of {@link ClerkDetail }
+     * 
+     */
+    public ClerkDetail createClerkDetail() {
+        return new ClerkDetail();
+    }
+
+    /**
      * Create an instance of {@link AdminSaveBusinessWrapper }
      * 
      */
@@ -462,6 +472,14 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link NodeDetail }
+     * 
+     */
+    public NodeDetail createNodeDetail() {
+        return new NodeDetail();
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link AdminDeleteSubscriptionResponse }{@code >}}
      * 
      */
@@ -480,21 +498,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SetReplicationNodes }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetAllPublisherDetail }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "set_ReplicationNodes")
-    public JAXBElement<SetReplicationNodes> createSetReplicationNodes(SetReplicationNodes value) {
-        return new JAXBElement<SetReplicationNodes>(_SetReplicationNodes_QNAME, SetReplicationNodes.class, null, value);
+    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "get_allPublisherDetail")
+    public JAXBElement<GetAllPublisherDetail> createGetAllPublisherDetail(GetAllPublisherDetail value) {
+        return new JAXBElement<GetAllPublisherDetail>(_GetAllPublisherDetail_QNAME, GetAllPublisherDetail.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetAllPublisherDetail }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SetReplicationNodes }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "get_allPublisherDetail")
-    public JAXBElement<GetAllPublisherDetail> createGetAllPublisherDetail(GetAllPublisherDetail value) {
-        return new JAXBElement<GetAllPublisherDetail>(_GetAllPublisherDetail_QNAME, GetAllPublisherDetail.class, null, value);
+    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "set_ReplicationNodes")
+    public JAXBElement<SetReplicationNodes> createSetReplicationNodes(SetReplicationNodes value) {
+        return new JAXBElement<SetReplicationNodes>(_SetReplicationNodes_QNAME, SetReplicationNodes.class, null, value);
     }
 
     /**
@@ -579,6 +597,24 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetFailedReplicationChangeRecordsMessageResponse }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "getFailedReplicationChangeRecordsMessageResponse")
+    public JAXBElement<GetFailedReplicationChangeRecordsMessageResponse> createGetFailedReplicationChangeRecordsMessageResponse(GetFailedReplicationChangeRecordsMessageResponse value) {
+        return new JAXBElement<GetFailedReplicationChangeRecordsMessageResponse>(_GetFailedReplicationChangeRecordsMessageResponse_QNAME, GetFailedReplicationChangeRecordsMessageResponse.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetFailedReplicationChangeRecordsMessageRequest }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "getFailedReplicationChangeRecordsMessage")
+    public JAXBElement<GetFailedReplicationChangeRecordsMessageRequest> createGetFailedReplicationChangeRecordsMessage(GetFailedReplicationChangeRecordsMessageRequest value) {
+        return new JAXBElement<GetFailedReplicationChangeRecordsMessageRequest>(_GetFailedReplicationChangeRecordsMessage_QNAME, GetFailedReplicationChangeRecordsMessageRequest.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link SyncSubscriptionRequest }{@code >}}
      * 
      */
@@ -642,21 +678,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SaveClerk }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AdminDeleteSubscriptionRequest }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "save_ClerkRequest")
-    public JAXBElement<SaveClerk> createSaveClerkRequest(SaveClerk value) {
-        return new JAXBElement<SaveClerk>(_SaveClerkRequest_QNAME, SaveClerk.class, null, value);
+    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "adminDelete_Subscription")
+    public JAXBElement<AdminDeleteSubscriptionRequest> createAdminDeleteSubscription(AdminDeleteSubscriptionRequest value) {
+        return new JAXBElement<AdminDeleteSubscriptionRequest>(_AdminDeleteSubscription_QNAME, AdminDeleteSubscriptionRequest.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AdminDeleteSubscriptionRequest }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SaveClerk }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "adminDelete_Subscription")
-    public JAXBElement<AdminDeleteSubscriptionRequest> createAdminDeleteSubscription(AdminDeleteSubscriptionRequest value) {
-        return new JAXBElement<AdminDeleteSubscriptionRequest>(_AdminDeleteSubscription_QNAME, AdminDeleteSubscriptionRequest.class, null, value);
+    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "save_ClerkRequest")
+    public JAXBElement<SaveClerk> createSaveClerkRequest(SaveClerk value) {
+        return new JAXBElement<SaveClerk>(_SaveClerkRequest_QNAME, SaveClerk.class, null, value);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java b/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
index a980249..1707014 100644
--- a/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
+++ b/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
@@ -1,4 +1,19 @@
-
+/*
+ * Copyright 2001-2008 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 package org.apache.juddi.v3_service;
 
 import java.rmi.RemoteException;
@@ -24,6 +39,8 @@ import org.apache.juddi.api_v3.DeletePublisher;
 import org.apache.juddi.api_v3.GetAllPublisherDetail;
 import org.apache.juddi.api_v3.GetEntityHistoryMessageRequest;
 import org.apache.juddi.api_v3.GetEntityHistoryMessageResponse;
+import org.apache.juddi.api_v3.GetFailedReplicationChangeRecordsMessageRequest;
+import org.apache.juddi.api_v3.GetFailedReplicationChangeRecordsMessageResponse;
 import org.apache.juddi.api_v3.GetPublisherDetail;
 import org.apache.juddi.api_v3.NodeDetail;
 import org.apache.juddi.api_v3.NodeList;
@@ -479,4 +496,24 @@ public interface JUDDIApiPortType {
         throws DispositionReportFaultMessage
     ,RemoteException;
 
+    /**
+     * 
+     *     gets a list of change records that were received from another node but failed to save locally, usually due to a key conflict
+     *     @since 3.3
+     *     
+     * 
+     * @param body
+     * @return
+     *     returns org.apache.juddi.api_v3.GetFailedReplicationChangeRecordsMessageResponse
+     * @throws DispositionReportFaultMessage
+     */
+    @WebMethod(action = "getFailedReplicationChangeRecords")
+    @WebResult(name = "getFailedReplicationChangeRecordsMessageResponse", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "response")
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public GetFailedReplicationChangeRecordsMessageResponse getFailedReplicationChangeRecords(
+        @WebParam(name = "getFailedReplicationChangeRecordsMessage", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
+        GetFailedReplicationChangeRecordsMessageRequest body)
+        throws DispositionReportFaultMessage, RemoteException
+    ;
+    
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/c0354a44/uddi-ws/src/main/resources/juddi_api_v1.wsdl
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/resources/juddi_api_v1.wsdl b/uddi-ws/src/main/resources/juddi_api_v1.wsdl
index 4ca22b1..68f4051 100644
--- a/uddi-ws/src/main/resources/juddi_api_v1.wsdl
+++ b/uddi-ws/src/main/resources/juddi_api_v1.wsdl
@@ -432,6 +432,24 @@ xmlns:uddi="urn:uddi-org:api_v3">
   </xs:complexType>
 
 
+
+ <xs:element name="getFailedReplicationChangeRecordsMessage" nillable="true" type="tns:getFailedReplicationChangeRecordsMessageRequest"/>
+  <xs:element name="getFailedReplicationChangeRecordsMessageResponse" nillable="true" type="tns:getFailedReplicationChangeRecordsMessageResponse"/>
+  <xs:complexType name="getFailedReplicationChangeRecordsMessageRequest">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="authInfo" type="xs:string"/>
+      <xs:element name="maxRecords" type="xs:long"/>
+      <xs:element name="offset" type="xs:long"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="getFailedReplicationChangeRecordsMessageResponse">
+    <xs:sequence >
+    <xs:element  ref="repl:changeRecords"/>
+  </xs:sequence>  
+  </xs:complexType>
+
+
+
   
   
 </xs:schema>
@@ -620,6 +638,13 @@ xmlns:uddi="urn:uddi-org:api_v3">
     <wsdl:part element="ns1:getEntityHistoryMessageResponse" name="response"></wsdl:part>
   </wsdl:message>
 
+  <wsdl:message name="getFailedReplicationChangeRecordsMessage">
+    <wsdl:part element="ns1:getFailedReplicationChangeRecordsMessage" name="body"></wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getFailedReplicationChangeRecordsMessageResponse">
+    <wsdl:part element="ns1:getFailedReplicationChangeRecordsMessageResponse" name="response"></wsdl:part>
+  </wsdl:message>
+
   
 
 
@@ -825,6 +850,16 @@ xmlns:uddi="urn:uddi-org:api_v3">
       <wsdl:output message="tns:getEntityHistoryMessageResponse" name="getEntityHistoryResponse"></wsdl:output>
       <wsdl:fault name="error" message="uddiport:dispositionReportFaultMessage"/>
     </wsdl:operation>
+
+    <wsdl:operation name="getFailedReplicationChangeRecords">
+   <wsdl:documentation>
+    gets a list of change records that were received from another node but failed to save locally, usually due to a key conflict
+    @since 3.3
+    </wsdl:documentation>
+        <wsdl:input message="tns:getFailedReplicationChangeRecordsMessage" name="getFailedReplicationChangeRecords"></wsdl:input>
+      <wsdl:output message="tns:getFailedReplicationChangeRecordsMessageResponse" name="getFailedReplicationChangeRecordsResponse"></wsdl:output>
+      <wsdl:fault name="error" message="uddiport:dispositionReportFaultMessage"/>
+    </wsdl:operation>
 	
 	
   </wsdl:portType>
@@ -1072,6 +1107,21 @@ xmlns:uddi="urn:uddi-org:api_v3">
     <wsdl:fault name="error"><soap:fault name="error" use="literal"/></wsdl:fault>
     </wsdl:operation>
 
+
+    <wsdl:operation name="getFailedReplicationChangeRecords">
+   
+      <soap:operation soapAction="getFailedReplicationChangeRecords" style="document"/>
+      <wsdl:input name="getFailedReplicationChangeRecords">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getFailedReplicationChangeRecordsResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    <wsdl:fault name="error"><soap:fault name="error" use="literal"/></wsdl:fault>
+    </wsdl:operation>
+
+
+
   </wsdl:binding>
   <wsdl:service name="JUDDIApiService">
   <wsdl:documentation>This service implements the jUDDI API service</wsdl:documentation> 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


Mime
View raw message