Return-Path: Delivered-To: apmail-ws-scout-dev-archive@www.apache.org Received: (qmail 66146 invoked from network); 18 Sep 2009 02:15:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Sep 2009 02:15:44 -0000 Received: (qmail 31053 invoked by uid 500); 18 Sep 2009 02:15:44 -0000 Delivered-To: apmail-ws-scout-dev-archive@ws.apache.org Received: (qmail 31007 invoked by uid 500); 18 Sep 2009 02:15:44 -0000 Mailing-List: contact scout-dev-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: scout-dev@ws.apache.org List-Id: Delivered-To: mailing list scout-dev@ws.apache.org Received: (qmail 30999 invoked by uid 500); 18 Sep 2009 02:15:44 -0000 Delivered-To: apmail-ws-scout-cvs@ws.apache.org Received: (qmail 30996 invoked by uid 99); 18 Sep 2009 02:15:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Sep 2009 02:15:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Sep 2009 02:15:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7D1DF238887A; Fri, 18 Sep 2009 02:15:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r816437 [1/3] - in /webservices/scout/trunk/src: main/java/org/apache/ws/scout/model/uddi/v2/ main/java/org/apache/ws/scout/registry/ test/java/org/apache/ws/scout/registry/ test/java/org/apache/ws/scout/registry/qa/ Date: Fri, 18 Sep 2009 02:15:19 -0000 To: scout-cvs@ws.apache.org From: tcunning@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090918021519.7D1DF238887A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tcunning Date: Fri Sep 18 02:15:18 2009 New Revision: 816437 URL: http://svn.apache.org/viewvc?rev=816437&view=rev Log: SCOUT-90 Merge over 1.1.1 fixes. Added: webservices/scout/trunk/src/test/java/org/apache/ws/scout/registry/JAXBTest.java - copied unchanged from r801696, webservices/scout/branches/scout-1.1/src/test/java/org/apache/ws/scout/registry/JAXBTest.java Modified: webservices/scout/trunk/src/main/java/org/apache/ws/scout/model/uddi/v2/AssertionStatusReport.java webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java webservices/scout/trunk/src/test/java/org/apache/ws/scout/registry/OwnershipTest.java webservices/scout/trunk/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java Modified: webservices/scout/trunk/src/main/java/org/apache/ws/scout/model/uddi/v2/AssertionStatusReport.java URL: http://svn.apache.org/viewvc/webservices/scout/trunk/src/main/java/org/apache/ws/scout/model/uddi/v2/AssertionStatusReport.java?rev=816437&r1=816436&r2=816437&view=diff ============================================================================== --- webservices/scout/trunk/src/main/java/org/apache/ws/scout/model/uddi/v2/AssertionStatusReport.java (original) +++ webservices/scout/trunk/src/main/java/org/apache/ws/scout/model/uddi/v2/AssertionStatusReport.java Fri Sep 18 02:15:18 2009 @@ -14,6 +14,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; @@ -43,7 +44,8 @@ "assertionStatusItem" }) public class AssertionStatusReport { - + + @XmlElement(required = true) protected List assertionStatusItem; @XmlAttribute(required = true) protected String generic; Modified: webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java URL: http://svn.apache.org/viewvc/webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java?rev=816437&r1=816436&r2=816437&view=diff ============================================================================== --- webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java (original) +++ webservices/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java Fri Sep 18 02:15:18 2009 @@ -619,81 +619,42 @@ private void clearPublisherAssertions( String authinfo,IRegistry ireg) { - Vector pasvect = null; - PublisherAssertion[] pasarr = null; + Vector pasvect = new Vector(); + try { AssertionStatusReport report = ireg.getAssertionStatusReport(authinfo,"status:complete"); List assertionStatusItemList = report.getAssertionStatusItem(); - AssertionStatusItem[] assertionStatusItemArr = - new AssertionStatusItem[assertionStatusItemList.size()]; + for (AssertionStatusItem assertionStatusItem : assertionStatusItemList) { + pasvect.add(this.getPublisherAssertion(assertionStatusItem)); + } - int len = assertionStatusItemArr != null? assertionStatusItemArr.length : 0; - for (int i = 0; i < len; i++) - { - AssertionStatusItem asi = assertionStatusItemArr[i]; - /* String sourceKey = asi.getFromKey(); - String targetKey = asi.getToKey(); - PublisherAssertion pa = new PublisherAssertion(); - pa.setFromKey(sourceKey); - pa.setToKey(targetKey); - KeyedReference keyr = asi.getKeyedReference(); - pa.setKeyedReference(keyr); - pa.setTModelKey(keyr.getTModelKey()); - pa.setKeyName(keyr.getKeyName()); - pa.setKeyValue(keyr.getKeyValue()); - if(pasvect == null) pasvect = new Vector(len); - pasvect.add(pa);*/ - if(pasvect == null) pasvect = new Vector(len); - pasvect.add(this.getPublisherAssertion(asi)); - } report = ireg.getAssertionStatusReport(authinfo,"status:toKey_incomplete"); - assertionStatusItemArr = report.getAssertionStatusItem().toArray(assertionStatusItemArr); - - len = assertionStatusItemArr != null? assertionStatusItemArr.length : 0; - for (int i = 0; i < len; i++) - { - AssertionStatusItem asi = (AssertionStatusItem) assertionStatusItemArr[i]; - if(pasvect == null) pasvect = new Vector(len); - pasvect.add(this.getPublisherAssertion(asi)); - } + assertionStatusItemList = report.getAssertionStatusItem(); + for (AssertionStatusItem assertionStatusItem : assertionStatusItemList) { + pasvect.add(this.getPublisherAssertion(assertionStatusItem)); + } report = ireg.getAssertionStatusReport(authinfo,"status:fromKey_incomplete"); - assertionStatusItemArr = report.getAssertionStatusItem().toArray(assertionStatusItemArr); - - len = assertionStatusItemArr != null? assertionStatusItemArr.length : 0; - for (int i = 0; i < len; i++) - { - AssertionStatusItem asi = (AssertionStatusItem) assertionStatusItemArr[i]; - if(pasvect == null) pasvect = new Vector(len); - pasvect.add(this.getPublisherAssertion(asi)); - } - - if (pasvect != null) { - pasarr = new PublisherAssertion[pasvect.size()]; - Iterator iter = pasvect.iterator(); - int pasarrPos = 0; - while (iter.hasNext()) { - pasarr[pasarrPos] = ((PublisherAssertion) iter.next()); - pasarrPos++; - } + assertionStatusItemList = report.getAssertionStatusItem(); + for (AssertionStatusItem assertionStatusItem : assertionStatusItemList) { + pasvect.add(this.getPublisherAssertion(assertionStatusItem)); + } + + if (pasvect.size() > 0) { + PublisherAssertion[] pasarr = new PublisherAssertion[pasvect.size()]; + int i=0; + for (PublisherAssertion publisherAssertion : pasvect) { + pasarr[i++] = publisherAssertion; + } + ireg.deletePublisherAssertions(authinfo, pasarr); } } catch (RegistryException e) { throw new RuntimeException(e); } - - if(pasarr != null && pasarr.length > 0) - try - { - ireg.deletePublisherAssertions(authinfo, pasarr); - } - catch (RegistryException e) - { - log.debug("Ignoring exception " + e.getMessage(),e); - } - } + } --------------------------------------------------------------------- To unsubscribe, e-mail: scout-dev-unsubscribe@ws.apache.org For additional commands, e-mail: scout-dev-help@ws.apache.org