http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml b/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml index b8cde50..5b2cdb0 100644 --- a/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml +++ b/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml @@ -77,6 +77,8 @@ <class>org.apache.juddi.model.ReplicationConfiguration</class> <class>org.apache.juddi.model.Edge</class> <class>org.apache.juddi.model.ControlMessage</class> + <class>org.apache.juddi.model.ReplicationConfigurationNode</class> + <class>org.apache.juddi.model.EdgeReceiverAlternate</class> <properties> <property name="hibernate.archive.autodetection" value="class"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml index 70cde98..d310f35 100644 --- a/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml +++ b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml @@ -78,6 +78,8 @@ <class>org.apache.juddi.model.ReplicationConfiguration</class> <class>org.apache.juddi.model.Edge</class> <class>org.apache.juddi.model.ControlMessage</class> + <class>org.apache.juddi.model.ReplicationConfigurationNode</class> + <class>org.apache.juddi.model.EdgeReceiverAlternate</class> <properties> <property name="hibernate.archive.autodetection" value="class"/> http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml b/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml index e762ef9..5cb247d 100644 --- a/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml +++ b/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml @@ -78,6 +78,8 @@ <class>org.apache.juddi.model.ReplicationConfiguration</class> <class>org.apache.juddi.model.Edge</class> <class>org.apache.juddi.model.ControlMessage</class> + <class>org.apache.juddi.model.ReplicationConfigurationNode</class> + <class>org.apache.juddi.model.EdgeReceiverAlternate</class> <properties> <property name="hibernate.archive.autodetection" value="class"/> http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml b/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml index c542732..9594254 100644 --- a/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml +++ b/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml @@ -75,6 +75,9 @@ <class>org.apache.juddi.model.Edge</class> <class>org.apache.juddi.model.Operator</class> <class>org.apache.juddi.model.ReplicationConfiguration</class> + <class>org.apache.juddi.model.ControlMessage</class> + <class>org.apache.juddi.model.ReplicationConfigurationNode</class> + <class>org.apache.juddi.model.EdgeReceiverAlternate</class> <properties> <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(SchemaAction='add')"/> http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 09768e2..4782fe0 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <cxf.version>2.7.5</cxf.version> + <cxf.version>2.7.13</cxf.version> <springframework.version>3.2.2.RELEASE</springframework.version> </properties> http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/uddi-ws/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-ws/pom.xml b/uddi-ws/pom.xml index 278f914..fedb9ca 100644 --- a/uddi-ws/pom.xml +++ b/uddi-ws/pom.xml @@ -1,31 +1,31 @@ <?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. - * - */ --> +* 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";> - <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.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> <profile> <id>regenerate-source</id> <build> @@ -53,13 +53,20 @@ </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> + <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> - </dependencies> + + <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/22a846dd/uddi-ws/src/main/java/org/apache/juddi/repl_v3/EdgeExt.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/repl_v3/EdgeExt.java b/uddi-ws/src/main/java/org/apache/juddi/repl_v3/EdgeExt.java deleted file mode 100644 index 35bf0a0..0000000 --- a/uddi-ws/src/main/java/org/apache/juddi/repl_v3/EdgeExt.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2013 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.repl_v3; - -import org.uddi.repl_v3.CommunicationGraph; - -/** - * - * @author Alex O'Ree - */ -public class EdgeExt extends CommunicationGraph.Edge { - - private String replicationUrl; - - public String getReplicationUrl() { - return replicationUrl; - } - - public void setReplicationUrl(String replicationUrl) { - this.replicationUrl = replicationUrl; - } -} http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/uddi-ws/src/main/java/org/uddi/api_v3/GetAuthToken.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/uddi/api_v3/GetAuthToken.java b/uddi-ws/src/main/java/org/uddi/api_v3/GetAuthToken.java index 1eb6f5a..05b55ad 100644 --- a/uddi-ws/src/main/java/org/uddi/api_v3/GetAuthToken.java +++ b/uddi-ws/src/main/java/org/uddi/api_v3/GetAuthToken.java @@ -14,8 +14,6 @@ * limitations under the License. * */ - - package org.uddi.api_v3; import java.io.Serializable; @@ -26,12 +24,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; - /** - * <p>Java class for get_authToken complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * + * <p> + * Java class for get_authToken complex type. + * + * <p> + * The following schema fragment specifies the expected content contained within + * this class. + * * <pre> * <complexType name="get_authToken"> * <complexContent> @@ -42,66 +42,70 @@ import javax.xml.bind.annotation.XmlType; * </complexContent> * </complexType> * </pre> - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "get_authToken") -public class GetAuthToken implements Serializable{ - @XmlTransient - private static final long serialVersionUID = -2736132681478711038L; - @XmlAttribute(required = true) - protected String userID; - @XmlAttribute(required = true) - protected String cred; +public class GetAuthToken implements Serializable { + + public GetAuthToken() { + } + + /** + * @since 3.3 + * @param username + * @param password + */ + public GetAuthToken(String username, String password) { + this.userID = username; + this.cred = password; + } + @XmlTransient + private static final long serialVersionUID = -2736132681478711038L; + @XmlAttribute(required = true) + protected String userID; + @XmlAttribute(required = true) + protected String cred; - /** - * Gets the value of the userID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getUserID() { - return userID; - } + /** + * Gets the value of the userID property. + * + * @return possible object is {@link String } + * + */ + public String getUserID() { + return userID; + } - /** - * Sets the value of the userID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setUserID(String value) { - this.userID = value; - } + /** + * Sets the value of the userID property. + * + * @param value allowed object is {@link String } + * + */ + public void setUserID(String value) { + this.userID = value; + } - /** - * Gets the value of the cred property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCred() { - return cred; - } + /** + * Gets the value of the cred property. + * + * @return possible object is {@link String } + * + */ + public String getCred() { + return cred; + } - /** - * Sets the value of the cred property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCred(String value) { - this.cred = value; - } + /** + * Sets the value of the cred property. + * + * @param value allowed object is {@link String } + * + */ + public void setCred(String value) { + this.cred = value; + } -} - \ No newline at end of file +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/uddi-ws/src/main/java/org/uddi/repl_v3/CommunicationGraph.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/CommunicationGraph.java b/uddi-ws/src/main/java/org/uddi/repl_v3/CommunicationGraph.java index 688dfb2..d9836e9 100644 --- a/uddi-ws/src/main/java/org/uddi/repl_v3/CommunicationGraph.java +++ b/uddi-ws/src/main/java/org/uddi/repl_v3/CommunicationGraph.java @@ -77,6 +77,7 @@ public class CommunicationGraph implements Serializable{ protected List<String> node; @XmlElement(required = true) protected List<String> controlledMessage; + @XmlElement(required = false) protected List<CommunicationGraph.Edge> edge; /** http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/uddi-ws/src/main/java/org/uddi/repl_v3/Operator.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/Operator.java b/uddi-ws/src/main/java/org/uddi/repl_v3/Operator.java index c8848b3..6f4e70c 100644 --- a/uddi-ws/src/main/java/org/uddi/repl_v3/Operator.java +++ b/uddi-ws/src/main/java/org/uddi/repl_v3/Operator.java @@ -14,8 +14,6 @@ * limitations under the License. * */ - - package org.uddi.repl_v3; import java.io.Serializable; @@ -31,12 +29,30 @@ import javax.xml.bind.annotation.XmlType; import org.uddi.api_v3.Contact; import org.w3._2000._09.xmldsig_.KeyInfoType; - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * + * The operator elements in a Replication Configuration Structure are a list of + * the nodes and established paths of communication between the nodes within a + * registry. The communication paths and general replication topology + * considerations are discussed later in this specification. + * <br><br> + * The operatorNodeID contains a unique key that is used to uniquely identify + * this node throughout the UDDI registry. The value used MUST match the + * businessKey of the Node Business Entity as referenced in Section 6.2.2 + * Self-Registration of Node Business Entity. The contact or contacts listed + * provide information about humans who should be contacted in the face of + * administrative and technical situations of various sorts. . The dsig:KeyInfo + * elements are intended to contain the certificate details if the + * soapReplicationURL makes use of Secure Sockets Layer 3.0 with mutual + * authentication as described in Section 7.5.5 Security Configuration. + * + * + * <p> + * Java class for anonymous complex type. + * + * <p> + * The following schema fragment specifies the expected content contained within + * this class. + * * <pre> * <complexType> * <complexContent> @@ -52,162 +68,150 @@ import org.w3._2000._09.xmldsig_.KeyInfoType; * </complexContent> * </complexType> * </pre> - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "operatorNodeID", - "operatorStatus", - "contact", - "soapReplicationURL", - "keyInfo" + "operatorNodeID", + "operatorStatus", + "contact", + "soapReplicationURL", + "keyInfo" }) @XmlRootElement(name = "operator") -public class Operator implements Serializable{ - @XmlTransient - private static final long serialVersionUID = 3012475870316361941L; - @XmlElement(required = true) - protected String operatorNodeID; - @XmlElement(required = true) - protected OperatorStatusType operatorStatus; - @XmlElement(namespace = "urn:uddi-org:api_v3", required = true) - protected List<Contact> contact; - @XmlElement(required = true) - @XmlSchemaType(name = "anyURI") - protected String soapReplicationURL; - @XmlElement(name = "KeyInfo", namespace = "http://www.w3.org/2000/09/xmldsig#";) - protected List<KeyInfoType> keyInfo; +public class Operator implements Serializable { - /** - * Gets the value of the operatorNodeID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getOperatorNodeID() { - return operatorNodeID; - } + @XmlTransient + private static final long serialVersionUID = 3012475870316361941L; + @XmlElement(required = true) + protected String operatorNodeID; + @XmlElement(required = true) + protected OperatorStatusType operatorStatus; + @XmlElement(namespace = "urn:uddi-org:api_v3", required = true) + protected List<Contact> contact; + @XmlElement(required = true) + @XmlSchemaType(name = "anyURI") + protected String soapReplicationURL; + @XmlElement(name = "KeyInfo", namespace = "http://www.w3.org/2000/09/xmldsig#";) + protected List<KeyInfoType> keyInfo; + + /** + * Gets the value of the operatorNodeID property. + * + * @return possible object is {@link String } + * + */ + public String getOperatorNodeID() { + return operatorNodeID; + } - /** - * Sets the value of the operatorNodeID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setOperatorNodeID(String value) { - this.operatorNodeID = value; - } + /** + * Sets the value of the operatorNodeID property. + * + * @param value allowed object is {@link String } + * + */ + public void setOperatorNodeID(String value) { + this.operatorNodeID = value; + } - /** - * Gets the value of the operatorStatus property. - * - * @return - * possible object is - * {@link OperatorStatusType } - * - */ - public OperatorStatusType getOperatorStatus() { - return operatorStatus; - } + /** + * Gets the value of the operatorStatus property. + * + * @return possible object is {@link OperatorStatusType } + * + */ + public OperatorStatusType getOperatorStatus() { + return operatorStatus; + } - /** - * Sets the value of the operatorStatus property. - * - * @param value - * allowed object is - * {@link OperatorStatusType } - * - */ - public void setOperatorStatus(OperatorStatusType value) { - this.operatorStatus = value; - } + /** + * Sets the value of the operatorStatus property. + * + * @param value allowed object is {@link OperatorStatusType } + * + */ + public void setOperatorStatus(OperatorStatusType value) { + this.operatorStatus = value; + } - /** - * Gets the value of the contact property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the contact property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContact().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list + /** + * Gets the value of the contact property. + * + * <p> + * This accessor method returns a reference to the live list, not a + * snapshot. Therefore any modification you make to the returned list + * will be present inside the JAXB object. This is why there is not a + * <CODE>set</CODE> method for the contact property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getContact().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list * {@link Contact } - * - * - */ - public List<Contact> getContact() { - if (contact == null) { - contact = new ArrayList<Contact>(); + * + * + */ + public List<Contact> getContact() { + if (contact == null) { + contact = new ArrayList<Contact>(); + } + return this.contact; } - return this.contact; - } - /** - * Gets the value of the soapReplicationURL property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSoapReplicationURL() { - return soapReplicationURL; - } + /** + * Gets the value of the soapReplicationURL property. + * + * @return possible object is {@link String } + * + */ + public String getSoapReplicationURL() { + return soapReplicationURL; + } - /** - * Sets the value of the soapReplicationURL property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSoapReplicationURL(String value) { - this.soapReplicationURL = value; - } + /** + * Sets the value of the soapReplicationURL property. + * + * @param value allowed object is {@link String } + * + */ + public void setSoapReplicationURL(String value) { + this.soapReplicationURL = value; + } - /** - * Gets the value of the keyInfo property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the keyInfo property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getKeyInfo().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list + /** + * Gets the value of the keyInfo property. + * + * <p> + * This accessor method returns a reference to the live list, not a + * snapshot. Therefore any modification you make to the returned list + * will be present inside the JAXB object. This is why there is not a + * <CODE>set</CODE> method for the keyInfo property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getKeyInfo().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list * {@link KeyInfoType } - * - * - */ - public List<KeyInfoType> getKeyInfo() { - if (keyInfo == null) { - keyInfo = new ArrayList<KeyInfoType>(); + * + * + */ + public List<KeyInfoType> getKeyInfo() { + if (keyInfo == null) { + keyInfo = new ArrayList<KeyInfoType>(); + } + return this.keyInfo; } - return this.keyInfo; - } -} - \ No newline at end of file +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/uddi-ws/src/main/java/org/uddi/repl_v3/ReplicationConfiguration.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/ReplicationConfiguration.java b/uddi-ws/src/main/java/org/uddi/repl_v3/ReplicationConfiguration.java index a96a06e..5ff9279 100644 --- a/uddi-ws/src/main/java/org/uddi/repl_v3/ReplicationConfiguration.java +++ b/uddi-ws/src/main/java/org/uddi/repl_v3/ReplicationConfiguration.java @@ -15,7 +15,6 @@ * */ - package org.uddi.repl_v3; import java.io.Serializable; @@ -26,6 +25,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import org.uddi.api_v3.Contact; @@ -79,11 +79,21 @@ import org.w3._2000._09.xmldsig_.SignatureType; "maximumTimeToGetChanges", "signature" }) +@XmlSeeAlso({ + org.uddi.api_v3.ObjectFactory.class, + org.uddi.custody_v3.ObjectFactory.class, + org.apache.juddi.ObjectFactory.class, + org.apache.juddi.api_v3.ObjectFactory.class, + org.uddi.repl_v3.ObjectFactory.class, + org.w3._2000._09.xmldsig_.ObjectFactory.class + + } +) @XmlRootElement(name = "replicationConfiguration") public class ReplicationConfiguration implements Serializable{ @XmlTransient private static final long serialVersionUID = 621260248291581845L; - protected long serialNumber; + protected long serialNumber; @XmlElement(required = true) protected String timeOfConfigurationUpdate; @XmlElement(required = true) @@ -317,7 +327,7 @@ public class ReplicationConfiguration implements Serializable{ * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { + @XmlType(name = "", namespace="urn:uddi-org:repl_v3", propOrder = { "contact" }) public static class RegistryContact { @@ -352,4 +362,3 @@ public class ReplicationConfiguration implements Serializable{ } } - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/uddi-ws/src/main/java/org/uddi/v3_service/UDDIReplicationPortType.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/uddi/v3_service/UDDIReplicationPortType.java b/uddi-ws/src/main/java/org/uddi/v3_service/UDDIReplicationPortType.java index 33f5416..2dda681 100644 --- a/uddi-ws/src/main/java/org/uddi/v3_service/UDDIReplicationPortType.java +++ b/uddi-ws/src/main/java/org/uddi/v3_service/UDDIReplicationPortType.java @@ -66,7 +66,7 @@ import org.uddi.repl_v3.TransferCustody; * Roman""> * </span></span>get_highWaterMarks</p> */ -@WebService(name = "UDDI_Replication_PortType", targetNamespace = "urn:uddi-org:v3_service") +@WebService(name = "UDDI_Replication_PortType", targetNamespace = "urn:uddi-org:repl_v3_portType") @XmlSeeAlso({ org.uddi.custody_v3.ObjectFactory.class, org.uddi.repl_v3.ObjectFactory.class, @@ -155,16 +155,20 @@ public interface UDDIReplicationPortType extends Remote { * code. Error reporting SHALL be that specified by Section 4.8 â Success * and Error Reporting of this specification. */ - @WebMethod(operationName = "get_changeRecords", action = "get_changeRecords") + @WebMethod(operationName = "get_changeRecords", action = "get_changeRecords") @WebResult(name = "changeRecord", targetNamespace = "urn:uddi-org:repl_v3") @RequestWrapper(localName = "get_changeRecords", targetNamespace = "urn:uddi-org:repl_v3", className = "org.uddi.repl_v3.GetChangeRecords") @ResponseWrapper(localName = "changeRecords", targetNamespace = "urn:uddi-org:repl_v3", className = "org.uddi.repl_v3.ChangeRecords") public List<ChangeRecord> getChangeRecords( - @WebParam(name = "requestingNode", targetNamespace = "urn:uddi-org:repl_v3") String requestingNode, - @WebParam(name = "changesAlreadySeen", targetNamespace = "urn:uddi-org:repl_v3") HighWaterMarkVectorType changesAlreadySeen, - @WebParam(name = "responseLimitCount", targetNamespace = "urn:uddi-org:repl_v3") BigInteger responseLimitCount, - @WebParam(name = "responseLimitVector", targetNamespace = "urn:uddi-org:repl_v3") HighWaterMarkVectorType responseLimitVector) - throws DispositionReportFaultMessage, RemoteException; + @WebParam(name = "requestingNode", targetNamespace = "urn:uddi-org:repl_v3") + String requestingNode, + @WebParam(name = "changesAlreadySeen", targetNamespace = "urn:uddi-org:repl_v3") + HighWaterMarkVectorType changesAlreadySeen, + @WebParam(name = "responseLimitCount", targetNamespace = "urn:uddi-org:repl_v3") + BigInteger responseLimitCount, + @WebParam(name = "responseLimitVector", targetNamespace = "urn:uddi-org:repl_v3") + HighWaterMarkVectorType responseLimitVector) + throws DispositionReportFaultMessage, RemoteException; /** * <p class="MsoBodyText">Nodes can inform other nodes that they have new @@ -221,8 +225,9 @@ public interface UDDIReplicationPortType extends Remote { @WebMethod(operationName = "notify_changeRecordsAvailable", action = "notify_changeRecordsAvailable") @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public void notifyChangeRecordsAvailable( - @WebParam(name = "notify_changeRecordsAvailable", targetNamespace = "urn:uddi-org:repl_v3", partName = "body") NotifyChangeRecordsAvailable body) - throws DispositionReportFaultMessage, RemoteException; + @WebParam(name = "notify_changeRecordsAvailable", targetNamespace = "urn:uddi-org:repl_v3", partName = "body") + NotifyChangeRecordsAvailable body) + throws DispositionReportFaultMessage,RemoteException; /** * This UDDI API message provides the means by which the current existence @@ -241,8 +246,9 @@ public interface UDDIReplicationPortType extends Remote { @WebResult(name = "operatorNodeID", targetNamespace = "urn:uddi-org:repl_v3", partName = "body") @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public String doPing( - @WebParam(name = "do_ping", targetNamespace = "urn:uddi-org:repl_v3", partName = "body") DoPing body) - throws DispositionReportFaultMessage, RemoteException; + @WebParam(name = "do_ping", targetNamespace = "urn:uddi-org:repl_v3", partName = "body") + DoPing body) + throws DispositionReportFaultMessage, RemoteException; /** * This UDDI API message provides a means to obtain a list of highWaterMark @@ -283,7 +289,7 @@ public interface UDDIReplicationPortType extends Remote { @RequestWrapper(localName = "get_highWaterMarks", targetNamespace = "urn:uddi-org:repl_v3", className = "org.uddi.repl_v3.GetHighWaterMarks") @ResponseWrapper(localName = "highWaterMarks", targetNamespace = "urn:uddi-org:repl_v3", className = "org.uddi.repl_v3.HighWaterMarkVectorType") public List<ChangeRecordIDType> getHighWaterMarks() - throws DispositionReportFaultMessage, RemoteException; + throws DispositionReportFaultMessage, RemoteException; /** * Invoked by the target node in a custody transfer operation in response to @@ -414,7 +420,7 @@ public interface UDDIReplicationPortType extends Remote { @WebMethod(operationName = "transfer_custody", action = "transfer_custody") @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public void transferCustody( - @WebParam(name = "transfer_custody", targetNamespace = "urn:uddi-org:repl_v3", partName = "body") TransferCustody body) - throws DispositionReportFaultMessage, RemoteException; -} - \ No newline at end of file + @WebParam(name = "transfer_custody", targetNamespace = "urn:uddi-org:repl_v3", partName = "body") + TransferCustody body) + throws DispositionReportFaultMessage, RemoteException; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/uddi-ws/src/test/java/org/apache/juddi/api_v3/GetPublisherDetailTest.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/test/java/org/apache/juddi/api_v3/GetPublisherDetailTest.java b/uddi-ws/src/test/java/org/apache/juddi/api_v3/GetPublisherDetailTest.java index a855c82..924aa6f 100644 --- a/uddi-ws/src/test/java/org/apache/juddi/api_v3/GetPublisherDetailTest.java +++ b/uddi-ws/src/test/java/org/apache/juddi/api_v3/GetPublisherDetailTest.java @@ -16,8 +16,11 @@ package org.apache.juddi.api_v3; import java.io.StringReader; import java.io.StringWriter; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; +import javax.xml.bind.JAXB; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; @@ -33,7 +36,13 @@ import static junit.framework.Assert.assertTrue; import org.junit.Test; import org.uddi.api_v3.AuthToken; +import org.uddi.api_v3.Contact; import org.uddi.api_v3.ObjectFactory; +import org.uddi.api_v3.PersonName; +import org.uddi.repl_v3.CommunicationGraph; +import org.uddi.repl_v3.Operator; +import org.uddi.repl_v3.OperatorStatusType; +import org.uddi.repl_v3.ReplicationConfiguration; /** * Testing marshalling functionality, making sure UTF-8 is handled correctly. @@ -85,5 +94,29 @@ public class GetPublisherDetailTest { fail("No exception should be thrown"); } } + + @Test + public void marshallReplicationMessage() throws Exception{ + ReplicationConfiguration r = new ReplicationConfiguration(); + r.setCommunicationGraph(new CommunicationGraph()); + Operator op = new Operator(); + op.setOperatorNodeID("a node"); + op.setSoapReplicationURL("http://localhost/services/replication";); + + op.getContact().add(new Contact()); + op.getContact().get(0).getPersonName().add(new PersonName("Unknown", null)); + op.setOperatorStatus(OperatorStatusType.NORMAL); + + r.getOperator().add(op); + r.getCommunicationGraph().getNode().add("a node"); + r.getCommunicationGraph().getControlledMessage().add("*"); + r.setSerialNumber(0); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkmmZ"); + r.setTimeOfConfigurationUpdate(sdf.format(new Date())); + r.setRegistryContact(new org.uddi.repl_v3.ReplicationConfiguration.RegistryContact()); + r.getRegistryContact().setContact(new Contact()); + r.getRegistryContact().getContact().getPersonName().add(new PersonName("Unknown", null)); + JAXB.marshal(r, System.out); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
